Hi, > [DP] - I think you did a pull and had local commits on your develop branch > and there were commits on the remote so it had to create a merge commit on > your develop branch to bring them together. This could have been avoided > using git pull --rebase or see my earlier email. Understand and sure but is this what we really want to happen? Do we want to email the commit list about local merges? And do we want to enforce everyone to use pull -rebase? Especially those new to git?
> [DP] - The only option I know of is to copy the whole repo directory on your > disk and then restore it if rebase goes wrong for you. Ouch! Sounds like a reason not to use rebase to me. > [DP] - I don't think so. See: > http://blog.sourcetreeapp.com/2012/08/21/merge-or-rebase/ That may be for experienced git users who know exactly what they are doing like yourself, but even the official git documentation states: "This is a potentially dangerous mode of operation. It rewrites history, which does not bode well when you published that history already. Do not use this option unless you have read git-rebase(1) carefully." (form http://git-scm.com/docs/git-pull) > [DP] - You can use various tools to see the log of commits. Unless you can tie the log of commits to JIRA and see the changes it going to be difficult to work out exactly what went in and that's speaking as someone who's been the release manager twice. Thanks, Justin
