Im having some conflicts on a branch when rebasing master into it.
Scenario is:
Branch off master, make some changes, commit said changes.
Checkout master, make some changes, commit said changes, checkout branch-1.
Try to rebase master – conflict..
Now I have other developers working in a similar fashion.
Master is kept in sync on all repo’s including the webserver, I don’t want master’s history being changed.
If I solve the rebase conflicts that are conflicting a point in the past, if I checkout master and merge it with the branch – will masters history be changed – or would those conflict resolutions be applied ontop of all the work im merging?
If you rebase, regardless of which branch you rebase into, you are changing the history of your repository. The idea is that when the other developers people pull master (from say origin) after you have pushed, their repos will be up to date as well.
To be clear: merge conflicts while rebasing will not change the history of master. Rebasing as a merge method will.
If you want to not change the history of master, you cannot rebase as a merge method. The default git merging behavior should work just fine for you, conflicts or not.