Git rebase duplicates functions -

i pretty new git, , can't find seeing, figure maybe doing wrong.

i trying rebase branch onto master branch has latest commits master, can test before final merge.

here workflow following:

> git clone <master> > git remote add branch_repo <branch> > git fetch branch_repo > git checkout -b new_branch branch_repo/branch > git fetch origin > git rebase origin/master 

other important information:

• this branch has several significant changes throughout code base
• master has been refactored @ least once since initial branch

the result is, after rebase completes, , resolve merge conflicts, resulting files have many duplicate functions. auto-merge makes no sense me - body of 1 function placed declaration of different function.

is workflow wrong, or unfortunate by-product of refactor+ major revision must resolved manually?

okay, if understand situation correct, how is. branched off master, made changes before push changes master, else updated master. have rebase off master new changes been made master. here how it. not totally wrong.

(assuming in branch)  1. > git checkout master 2. > git pull (assuming remote points origin/master) 3. > git checkout your_branch (assuming there no merge conflicts during pull) 4. > git rebase -i master (now local master date can rebase off it) 

sort out merge conflicts , should go.