change 1, change 2, change 3, change 4 / master >> branch \ branch a1 \ change 1001
i have made branch master @ beginning. have made branch out of branch (a1).
over time have make several changes branch a. have done changes branch a1.
now branch a1's change master (change 1001), without changes branch (changes 1-4).
can done git? , if it's possible, appropriate steps achieve this?
i'm using egit plugin in eclipse.
you have
x--x--x (master) \ y--y1--change 1, change 2, change 3, change 4 (brancha) \ change 1001 (brancha1)
or:
change 1001 (brancha1) / x--x--x (master) \ y--y--change 1, change 2, change 3, change 4 (brancha)
in second case (brancha1
comes master
), merge brancha1
on master
.
but in first case (brancha1
comes brancha
), can:
git cherry-pick change 1001
but leave duplicate commits , subject functional dependencies.
try avoid cherry-picking, if possible.
or:
git rebase --onto master y1 brancha1
that move commits brancha1
(after y1
of brancha
) onto master
branch. no duplicate commits
Comments
Post a Comment