git merge problem

[Andreas Schwab]

Neal Becker <ndbecker2 at gmail.com> writes:

> 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

Apparently this is the first time you merge master into f13 since the
git conversion.  You can use "git merge -X theirs master" to overwrite
the files with the versions from master.  You only need to do this once
for any branch that was never merged in git.

Andreas.

-- 
Andreas Schwab, schwab at redhat.com
GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84  5EC7 45C6 250E 6F00 984E
"And now for something completely different."