Re: git merge problem

2010-10-27 Thread 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 > fedp

git merge problem

2010-10-27 Thread Neal Becker
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