That doesn't work either. Especially for this case:

git checkout master
git checkout -b feature-x
# ....
git commit -am "finished feature"
git checkout master
git merge feature-x
git checkout feature-x
# ....
git commit -am "forgot something"
git checkout master
git merge feature-x
git checkout live
#
# I really would love to do git merge feature-x

I always end up with changes in live that are not related to the
feature-x

-- 
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