Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit » How to configure default merge strategy?
How to configure default merge strategy? [message #753901] Sun, 30 October 2011 12:39 Go to next message
Martin Fluegge is currently offline Martin FlueggeFriend
Messages: 141
Registered: July 2009
Senior Member
Hi,

I committed two changes to my "master" and then pulled from the remote repository. After this operation pushing was prohibited because the merge operation during the pull was not able to merge the changes (see attached images). I found out that egit per default uses "resolve" as merge strategy. Trying a "merge" on the git bash was able to merge the different changes because it was using "recursiv" as merge strategy.

Is there a way to change the default merge strategy egit uses?

Thanks in advance.

Cheers,

Martin
Re: How to configure default merge strategy? [message #753913 is a reply to message #753901] Sun, 30 October 2011 14:46 Go to previous messageGo to next message
Robin Rosenberg is currently offline Robin RosenbergFriend
Messages: 332
Registered: July 2009
Senior Member
Martin Fluegge skrev 2011-10-30 13.3925:
> Hi,
>
> I committed two changes to my "master" and then pulled from the remote repository. After this operation pushing was prohibited because the merge operation during the pull was not able to merge the changes (see attached images). I found out that egit per default uses "resolve" as merge strategy. Trying a "merge" on the git bash was able to merge the different changes because it was using "recursiv" as merge strategy.
>
> Is there a way to change the default merge strategy egit uses?
>

At the moment EGit does not have the recursive merge strategy. The reason
is that initially we did not have rename detection. Now, we do. so adding
the recursive merge should be fairly simple.

-- robin
Re: How to configure default merge strategy? [message #753921 is a reply to message #753913] Sun, 30 October 2011 15:40 Go to previous messageGo to next message
Martin Fluegge is currently offline Martin FlueggeFriend
Messages: 141
Registered: July 2009
Senior Member
Hi Robin,

thanks for your quick response. Shall I file a bugzilla for this topic?

Cheers,

Martin

Am 30.10.2011 15:46, schrieb Robin Rosenberg:
> Martin Fluegge skrev 2011-10-30 13.3925:
>> Hi,
>>
>> I committed two changes to my "master" and then pulled from the remote
>> repository. After this operation pushing was prohibited because the
>> merge operation during the pull was not able to merge the changes (see
>> attached images). I found out that egit per default uses "resolve" as
>> merge strategy. Trying a "merge" on the git bash was able to merge the
>> different changes because it was using "recursiv" as merge strategy.
>>
>> Is there a way to change the default merge strategy egit uses?
>>
>
> At the moment EGit does not have the recursive merge strategy. The reason
> is that initially we did not have rename detection. Now, we do. so adding
> the recursive merge should be fairly simple.
>
> -- robin
>
>
Re: How to configure default merge strategy? [message #753926 is a reply to message #753921] Sun, 30 October 2011 17:08 Go to previous messageGo to next message
Eike Stepper is currently offline Eike StepperFriend
Messages: 5590
Registered: July 2009
Senior Member
Am 30.10.2011 16:40, schrieb Martin Fl├╝gge:
> Hi Robin,
>
> thanks for your quick response. Shall I file a bugzilla for this topic?
I found this: https://bugs.eclipse.org/bugs/show_bug.cgi?id=354099

Cheers
/Eike

----
http://www.esc-net.de
http://thegordian.blogspot.com
http://twitter.com/eikestepper


>
> Cheers,
>
> Martin
>
> Am 30.10.2011 15:46, schrieb Robin Rosenberg:
>> Martin Fluegge skrev 2011-10-30 13.3925:
>>> Hi,
>>>
>>> I committed two changes to my "master" and then pulled from the remote
>>> repository. After this operation pushing was prohibited because the
>>> merge operation during the pull was not able to merge the changes (see
>>> attached images). I found out that egit per default uses "resolve" as
>>> merge strategy. Trying a "merge" on the git bash was able to merge the
>>> different changes because it was using "recursiv" as merge strategy.
>>>
>>> Is there a way to change the default merge strategy egit uses?
>>>
>> At the moment EGit does not have the recursive merge strategy. The reason
>> is that initially we did not have rename detection. Now, we do. so adding
>> the recursive merge should be fairly simple.
>>
>> -- robin
>>
>>
Re: How to configure default merge strategy? [message #756143 is a reply to message #753926] Fri, 11 November 2011 08:45 Go to previous messageGo to next message
Sylvain Laurent is currently offline Sylvain LaurentFriend
Messages: 6
Registered: November 2011
Junior Member
Is recursive merge strategy planned for 1.2.0 ? it would really help to handle merges with renamed files.
Re: How to configure default merge strategy? [message #756178 is a reply to message #756143] Fri, 11 November 2011 12:01 Go to previous messageGo to next message
Matthias Sohn is currently offline Matthias SohnFriend
Messages: 612
Registered: July 2009
Senior Member
1.2 is planned for Dec 15 and I am not aware that anyone is currently working on this
Re: How to configure default merge strategy? [message #760795 is a reply to message #753901] Mon, 05 December 2011 10:02 Go to previous message
Andre Dietisheim is currently offline Andre DietisheimFriend
Messages: 130
Registered: July 2009
Senior Member
Just to add some more pointers to this topic: the bugzilla that I guess is watching the progress on the recursive merging strategy (which should handle merging better than the resolve strategy) is here: https://bugs.eclipse.org/bugs/show_bug.cgi?id=359951
Previous Topic:gui nit in history view
Next Topic:Staging view shows unchanged files
Goto Forum:
  


Current Time: Sat Dec 20 21:04:29 GMT 2014

Powered by FUDForum. Page generated in 0.01853 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software