On Sep 17, 6:45 pm, Adam Prescott <mention...@gmail.com> wrote:
> Could you not do
>
> git checkout master
> git merge feature-x
> git checkout live
> git merge feature-x^
>
> ?
>
> After you merge, the ref "feature-x" points to the same commit as
> "master", whereas what you actually want to merge is the pre-merge
> feature-x, in both situations, if you see what I mean.

Makes sense, I am going to try that too.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-us...@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Reply via email to