Ok, I've just seen your reply. I'm not sure if what you described is the most convenient flow, but without changing it, in case you don't actually make commits on "merged-dish" and you want to go with merging, after updating "master" and/or "Dish" you may do:
git branch -d merged-dish git checkout -b merged-dish master git merge Dish This will, once again, provide you with an up-to-date working copy of "merged-dish". Rinse, repeat. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
