git merge problem

[Nathaniel McCallum]

On 10/27/2010 10:38 AM, Neal Becker wrote:
> 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?

See my recent blog on this topic:

http://nathaniel.themccallums.org/2010/10/18/using-git-fast-forward-merging-to-keep-branches-in-sync/

Nathaniel