[IPython-dev] Force-pushed

Jason Grout jason-sage@creativetrax....
Wed Jan 18 12:57:09 CST 2012


On 1/18/12 12:50 PM, Brian Granger wrote:
>>> What did I do wrong when I merged this?  I rebased in on master and then
>>> >>  did:
>>> >>
>>> >>  git co master
>>> >>  git merge branchname
>>> >>  git push upstream master
>> >
>> >
>> >  If you rebased the branch on master, it is possible that the merge was a
>> >  "fast-forward", i.e. a merge commit was not needed since the history merged
>> >  in from the branch could be brought in as a set of patches that applied
>> >  cleanly on top of master without the need for conflict resolution.
>> >
>> >  To force a merge commit, use `git merge --no-ff branchname`.
> Ahh, yes, I imagine this is exactly what happened.  Thanks for the
> clarification - my git-fu is definitely out of shape right now...


For the rest of us learning more about git...why would a fast-forward 
merge be bad enough to do a force push?  Is it just that it is against 
the policy of (almost) always doing --no-ff?

Thanks,

Jason



More information about the IPython-dev mailing list