Comments on: AutoMapper Git workflow – dealing with bugs/issueshttps://lostechies.com/jimmybogard/2010/04/30/automapper-git-workflow-dealing-with-bugs-issues/
Strong opinions, weakly heldMon, 04 Dec 2017 19:31:00 +0000hourly1http://wordpress.org/?v=3.4.2By: Pete Harlanhttps://lostechies.com/jimmybogard/2010/04/30/automapper-git-workflow-dealing-with-bugs-issues/#comment-2369
Pete HarlanWed, 17 Nov 2010 19:17:34 +0000/blogs/jimmy_bogard/archive/2010/04/30/automapper-git-workflow-dealing-with-bugs-issues.aspx#comment-2369Hi,
Thanks for writing the article; I hadn't seen gitextensions before and it looks really nice.
In this sequence of commands:
git checkout SomeIssue
git rebase master
git checkout master
git rebase SomeIssue <- this is just a fast-forward merge at this point
That last rebase should really be "git merge SomeIssue".
Although "git rebase X" does fast-forward the current branch to X if the current branch is an ancestor of X (as in your example), that is just an artifact of how rebase is implemented. Conceptually it doesn't make sense to rebase onto a branch that you're an ancestor of, and I think your example would be improved by using merge there instead of rebase.
You might even want "git merge --ff-only SomeIssue", because if the merge isn't a fast-forward then something is wrong. (Since you just rebased SomeIssue onto master, a non-ff merge could mean someone else is working in the same repo at the same time.)Hi,

Thanks for writing the article; I hadn’t seen gitextensions before and it looks really nice.

Although “git rebase X” does fast-forward the current branch to X if the current branch is an ancestor of X (as in your example), that is just an artifact of how rebase is implemented. Conceptually it doesn’t make sense to rebase onto a branch that you’re an ancestor of, and I think your example would be improved by using merge there instead of rebase.

You might even want “git merge –ff-only SomeIssue”, because if the merge isn’t a fast-forward then something is wrong. (Since you just rebased SomeIssue onto master, a non-ff merge could mean someone else is working in the same repo at the same time.)

]]>By: Mike Murrayhttps://lostechies.com/jimmybogard/2010/04/30/automapper-git-workflow-dealing-with-bugs-issues/#comment-2367
Mike MurrayFri, 30 Apr 2010 16:54:21 +0000/blogs/jimmy_bogard/archive/2010/04/30/automapper-git-workflow-dealing-with-bugs-issues.aspx#comment-2367How well does a workflow like this work in Mercurial?How well does a workflow like this work in Mercurial?
]]>