Assume the following:

Off Linux 3.14 master , a branch is created my-branch-3.14 and platforms 
support is added.

Next, these platforms support should be added to Linux 4.0 in my-branch-4.0 

How would you manage having the 3.14 code added to my-branch-4.0

A merge? :
git merge my-branch-3.14

Or a rebase and squash  of a parallel branch to my-branch-3.14 to 

If I was doing a git merge, I would think git merge commit of the whole 
history from 3.14 would happen each I move forward to 
a new branch (my-branch-4.x)


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 
For more options, visit

Reply via email to