[git] Git issues

[Cesar Celis]

Dear all,

I am having some problems during the merge process of two branches
(associated to other two repositories). The message error is the following
one:



Merge of revisions c1d3025c3e1aa376cfd3ffd96f9dd555c4346c71,
75d787f6a776b3cd100f0c87e68f6acc4b59d00b with base
55e0fa5fb5f5ca58008aa005e2c5b186af4f4018 using strategy resolve resulted in:
Failed.



Is there any way of finding out what is going on in this particular case? (I
need additional information in order to correct the problem.)

Many thanks,

Cesar



PS. I am using Eclipse and Photran during the process.

[Matthias Sohn]

Dear all,****
I am having some problems during the merge process of two branches
(associated to other two repositories). The message error is the following
one:****
** **
*Merge of revisions c1d3025c3e1aa376cfd3ffd96f9dd555c4346c71,
75d787f6a776b3cd100f0c87e68f6acc4b59d00b with base
55e0fa5fb5f5ca58008aa005e2c5b186af4f4018 using strategy resolve resulted
in: Failed.*
** **
Is there any way of finding out what is going on in this particular case?
(I need additional information in order to correct the problem
)****
Many thanks,****
Cesar****
** **
PS. I am using Eclipse and Photran during the process.

Did you use native Git or EGit for this merge ?
There are some types of version graphs (those where the base version
cannot be determined in one step) resolve merge strategy can't handle.
Try the recursive strategy (this should be the default for native git
if you try to
merge two branches) [1].

[1] search for recursive in http://schacon.github.com/git/git-merge.html

[Cesar Celis]

Cheers... Cesar



De: git-***@eclipse.org [mailto:git-***@eclipse.org] Em nome de Matthias Sohn
Enviada em: terça-feira, 6 de dezembro de 2011 19:46
Para: Git related discussions, specifcally migration help for projects at Eclipse.org
Assunto: Re: [git] Git issues



2011/12/6 Cesar Celis <***@gmail.com>

Dear all,

I am having some problems during the merge process of two branches (associated to other two repositories). The message error is the following one:



Merge of revisions c1d3025c3e1aa376cfd3ffd96f9dd555c4346c71, 75d787f6a776b3cd100f0c87e68f6acc4b59d00b with base 55e0fa5fb5f5ca58008aa005e2c5b186af4f4018 using strategy resolve resulted in: Failed.



Is there any way of finding out what is going on in this particular case? (I need additional information in order to correct the problem
)

Many thanks,

Cesar



PS. I am using Eclipse and Photran during the process.



Did you use native Git or EGit for this merge ?

There are some types of version graphs (those where the base version

cannot be determined in one step) resolve merge strategy can't handle.

Try the recursive strategy (this should be the default for native git if you try to

merge two branches) [1].



[1] search for recursive in http://schacon.github.com/git/git-merge.html