git - Syncing a branch with master -


i have 2 branches

master branch: -> b -> c -> d

lag-branch : -> x -> y

note patches x , y add new files , not in conflict files in master branch.

i want following sync'd lag-branch : a-> x -> y -> b -> c -> d

but, when run command:

git merge -s recursive -x theirs master

i merge conflicts between files haven't touched. example, unmerged paths of type "deleted us".

is possible merge master lag (i.e. sync lag-branch master) without having manually resolve conflicts or deal "deleted us/them unmerged paths


Comments