|Re: [cross-project-issues-dev] I think I broke something|
Hello Mark,I just pulled your changes from the aggro git repo and couldn't notice anything suspicous - the commit you're referring to is a completely normal 'auto-merge'-commit when pulling changes from a repository which has been modified (updated by somebody elses push(es) and thereby his commits - in your case it's the one from Adolfo SBH). This auto-merge on pull (of your local commit(s) and the one pulled from the remote repo) gets committed automatically if has been applied without any conflicts and it's also mandatory that it is pushed to the remote repo when pushing your local commits.
Does everybody else agree... ? :) With best regards, MarkusTP.S.: There are also other auto-merge strategies on pull - you might want to take a look at "auto-rebase" on pull (though this is in my oppinion a little bit more dangorous for git beginners)
On 15.08.2012 14:16, Mark Russell wrote:
this is the commit I think I messed everything up with. 902663d4bd465dd873dbbe41ce25e622bcd688ed <http://git.eclipse.org/c/simrel/org.eclipse.simrel.build.git/commit/?id=902663d4bd465dd873dbbe41ce25e622bcd688ed>On Wed, Aug 15, 2012 at 8:13 AM, Mark Russell <mrrussell@xxxxxxxxxx <mailto:mrrussell@xxxxxxxxxx>> wrote:I thought knew how to push my changes for WindowBuilder to the aggro git repo but I think I did something bad. I tried to push the window builder project so I could turn it on but I think I undid everyone else changes. I'm looking for help cleaning up my mess.-- Mark R Russell(724) 473-3140 <tel:724%29%20473-3140> Software Engineer in Test Google Pittsburgh -- Mark R Russell (724) 473-3140 Software Engineer in Test Google Pittsburgh _______________________________________________ cross-project-issues-dev mailing list cross-project-issues-dev@xxxxxxxxxxx https://dev.eclipse.org/mailman/listinfo/cross-project-issues-dev
Back to the top