git merge problem
Neal Becker
ndbecker2 at gmail.com
Wed Oct 27 14:38:16 UTC 2010
Sorry to be so stupid. I don't really have a lot of time to spend on this,
maybe someone can give me a clue.
I updated unuran master just fine.
Then I did my usual dance:
fedpkg switch-branch f14
git merge master
fedpkg push
fedpkg build
bohdi ...
fedpkg switch-branch f13
Branch f13 set up to track remote branch f13/master from origin.
[nbecker at nbecker1 unuran]$ git merge master
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
Auto-merging sources
CONFLICT (content): Merge conflict in sources
Auto-merging unuran.spec
CONFLICT (content): Merge conflict in unuran.spec
Automatic merge failed; fix conflicts and then commit the result.
What's wrong and how to fix it?
More information about the devel
mailing list