I have my repository setup with git-svn and two branches with an svn remote. I want to merge changes from svn-trunk into the svn-branch1 and then propagate those to my local git only branches.
I am using:
git checkout branch1
git merge master
The merge always results in add/add conflicts for every file edited in trunk, even when branch1 does not have any local changes. Why does this happen and how can I avoid it?
How do you suggest propagating the changes to the git branches? I am using:
git checkout branch1_gitlocal
git rebase branch1
