Re: [git-users] question on code management

2016-03-01 Thread Magnus Therning
'Renaud Barbier' via Git for human beings writes: > 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

[git-users] question on code management

2016-03-01 Thread 'Renaud Barbier' via Git for human beings
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