On 03/30/2010 07:23 AM, David ?Bombe? Roden wrote:
> No, it will not. If work on the branch continues (which is unlikely because
> it
> has been merged so further work would happen on the master branch) I would
> just merge master again. Simple and beautiful.
What I meant by weird was it'll look like this:
-o---o o---o <- master
\ /
\ /
\ /
-o---o---o---o---o <- identicon
which looks like master was pulled into identicon then branched off again.
Which is basically what has happened here without --no-ff. But it should really
look like this:
-o---o---o---o---o <- master
/
/
/
-o---o---o---o <- identicon
If you are going to have a merge-and-push workflow then it makes sense to do
this consistently, and generate a merge commit whenever you pull from a repo
that you are not tracking.
X
