I developed an admin panel, which was designed for a specific client. Now, the project requirements demand, that non-client-specific code should be extracted as a separate git branch to serve as a basis for the new client-specific variations of the project.
My goal, as I already mentioned, is to:
After you extract non client specific code and create commit (
commit-1) from it, you need to merge this commit back to client specific branch. As this merge should not change content of client specific branch, you should use
ours merge strategy:
git checkout client-branch git merge -s ours commit-1
The effective result of this merge is that following merge of
client-branch will consider
commit-1 as merge base.