[git] Git issues

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]

[git] Git issues

From: "Cesar Celis" <cesar.celis.perez@xxxxxxxxx>
Date: Tue, 6 Dec 2011 15:20:00 -0200
Delivered-to: git@xxxxxxxxxxx
List-archive: <http://dev.eclipse.org/mailman/private/git>
List-help: <mailto:git-request@eclipse.org?subject=help>
List-subscribe: <http://dev.eclipse.org/mailman/listinfo/git>, <mailto:git-request@eclipse.org?subject=subscribe>
List-unsubscribe: <http://dev.eclipse.org/mailman/options/git>, <mailto:git-request@eclipse.org?subject=unsubscribe>
Thread-index: Acy0OzogStEGMTeJT+ajumK5RE5+6A==

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.

Follow-Ups:
- Re: [git] Git issues
  - From: Matthias Sohn

Prev by Date: Re: [git] Tags migrated from SVN
Next by Date: Re: [git] Git issues
Previous by thread: [git] Tags migrated from SVN
Next by thread: Re: [git] Git issues
Index(es):
- Date
- Thread

Breadcrumbs