Eclipse Community Forums: EGit » How to configure default merge strategy?

Help

Home

Home » Eclipse Projects » EGit » How to configure default merge strategy?

Show: Today's Messages :: Show Polls :: Message Navigator

How to configure default merge strategy? [message #753901]

Sun, 30 October 2011 08:39

Martin Fluegge
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

Attachment: HistoryView.JPG
(Size: 127.16KB, Downloaded 80 times)
Attachment: pullResult.JPG
(Size: 37.39KB, Downloaded 76 times)

Report message to a moderator

Re: How to configure default merge strategy? [message #753913 is a reply to message #753901]

Sun, 30 October 2011 10:46

Robin Rosenberg
Messages: 266
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

Report message to a moderator

Re: How to configure default merge strategy? [message #753921 is a reply to message #753913]

Sun, 30 October 2011 11:40

Martin Fluegge
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
>
>

Report message to a moderator

Re: How to configure default merge strategy? [message #753926 is a reply to message #753921]

Sun, 30 October 2011 13:08

Eike Stepper
Messages: 5153
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
>>
>>

Report message to a moderator

Re: How to configure default merge strategy? [message #756143 is a reply to message #753926]

Fri, 11 November 2011 03:45

Sylvain Laurent
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.

Report message to a moderator

Re: How to configure default merge strategy? [message #756178 is a reply to message #756143]

Fri, 11 November 2011 07:01

Matthias Sohn
Messages: 395
Registered: July 2009

Senior Member

1.2 is planned for Dec 15 and I am not aware that anyone is currently working on this

Report message to a moderator

Re: How to configure default merge strategy? [message #760795 is a reply to message #753901]

Mon, 05 December 2011 05:02

Andre Dietisheim
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

Report message to a moderator

Previous Topic:	gui nit in history view
Next Topic:	Staging view shows unchanged files

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Tue May 21 22:55:07 EDT 2013