i did this:
cd /repo1 git clone <remote-repo> git checkout -b mynewbranch <edit1> git add git commit <edit2> git add git commit cd /repo2 git clone <remote-repo> cd /repo1 git checkout master git merge mynewbranch # messages # merged ok. git checkout mynewbranch git push /repo2 mynewbranch:mynewbranch cd /repo2 git branch * master mynewbranch git merge mynewbranch # tons of merge conflict errors
directories repo1 , repo2 have clones of exact same version , branch of code. git branch -r
says same thing in both directories well.
merging branch in repo1 works perfectly. when push branch repo2 , try same merge, merge conflicts.
what missing? can done correctly?