FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Redhat > Fedora Development

 
 
LinkBack Thread Tools
 
Old 10-27-2010, 02:38 PM
Neal Becker
 
Default git merge problem

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@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?

--
devel mailing list
devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/devel
 
Old 10-27-2010, 02:42 PM
Nathaniel McCallum
 
Default git merge problem

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@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
--
devel mailing list
devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/devel
 
Old 10-27-2010, 03:22 PM
Andreas Schwab
 
Default git merge problem

Neal Becker <ndbecker2@gmail.com> writes:

> fedpkg switch-branch f13
> Branch f13 set up to track remote branch f13/master from origin.
> [nbecker@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@redhat.com
GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84 5EC7 45C6 250E 6F00 984E
"And now for something completely different."
--
devel mailing list
devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/devel
 
Old 10-27-2010, 03:30 PM
Neal Becker
 
Default git merge problem

Andreas Schwab wrote:

> Neal Becker <ndbecker2@gmail.com> writes:
>
>> fedpkg switch-branch f13
>> Branch f13 set up to track remote branch f13/master from origin.
>> [nbecker@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.
>

But why did the same procedure work for f14 but not f13?

--
devel mailing list
devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/devel
 
Old 10-27-2010, 03:37 PM
Jesse Keating
 
Default git merge problem

"Neal Becker" <ndbecker2@gmail.com> wrote:

>Andreas Schwab wrote:
>
>> Neal Becker <ndbecker2@gmail.com> writes:
>>
>>> fedpkg switch-branch f13
>>> Branch f13 set up to track remote branch f13/master from origin.
>>> [nbecker@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.
>>
>
>But why did the same procedure work for f14 but not f13?
>


Because the f14 branches were made after the switch to git, so they are in better shape. F13 and earlier came from CVS and thus are not quite perfect.
--
Sent from my Android phone. Please excuse my brevity.
--
devel mailing list
devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/devel
 

Thread Tools




All times are GMT. The time now is 01:32 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org