Hi,

I wanted to know the best practice in this scenario:

Let's say I'm working on a branch W. This branches already has changes
merged from two other branches A and B. Now when I work no W, I had to
make changes for bugs/enhancement in the areas of code managed by A
and B. What is the best practice in this case? Do I keep making
switches and and make commits to respective branches A and B. Or do I
just check them in W for the time being (A' and B'), and then later
cherry-pick/rebase later to respective branches?

     A
-O---O-+
        \        A'  B'
-O---O---O---O---O---O---O W
            /
  -O----O--+
        B

I think it's more or less about managing patches which actually belong
to upstream.

Thanks
:J
-- 
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