I have developed a site with some functionality and some basic pages like "about us", "contacts" and some pages for SEO. It is in a git repository.
And now I want to make a copy of this site with other data in simple pages and without these seo-pages.
So I git branch second
'ed it and made some modifications and deletions of files in that branch.
Then I came back into master and added some features, bugfixes and some other stuff.
Now I want make these changes in the common part of the site to appear in second
branch.
I git checkout second
, and git rebase master
. Git asked to resolve conflicts to continue. Ok, I fixed a lot of conflicts and finally it rebased and even pushed into my remote repo.
BUT! If I try right now to git rebase master
again, i'll get the same conflicts all over again (even if i did zero modifications!) and have to re-do the crazy conflict resolution :(
I thought it will remember my actions in each conflict situation and will ask me only in new places with new features/bugfixes. But it doesn't.
How can I setup my two branches to maintain 2 sites with no hurt? Maybe merge? Some other command?