Simple action to copy branch into the other
-
Make sure to be in your development branch:
$ git checkout branch_with_development -
Move you to final files branch:
$ git checkout branch_to_update -
Rewrite final with development without lost versions:
$ git merge branch_with_development
a better Rewrite way:
in this way you update your local branch (not high conflict) and set a new smart marge (direct accepting all incoming changes)
- unix:
$ git pull origin HEAD && git merge --strategy-option=theirs development
win:> git pull origin HEAD; git merge --strategy-option=theirs development