Egit and Merge issues [message #761588] |
Tue, 06 December 2011 12:42  |
Eclipse User |
|
|
|
Dear all,
I am having some problems during the merge process of two branches (associated to other two repositories). The error message 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.
|
|
|
|
|
|
|
|
Powered by
FUDForum. Page generated in 0.15877 seconds