[orion-dev] git merge conflicts

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

[orion-dev] git merge conflicts

From: John J Barton <johnjbarton@xxxxxxxxxxxxxxx>
Date: Mon, 19 Dec 2011 07:37:02 -0800
Delivered-to: orion-dev@xxxxxxxxxxx
List-archive: <https://dev.eclipse.org/mailman/private/orion-dev>
List-help: <mailto:orion-dev-request@eclipse.org?subject=help>
List-subscribe: <https://dev.eclipse.org/mailman/listinfo/orion-dev>, <mailto:orion-dev-request@eclipse.org?subject=subscribe>
List-unsubscribe: <https://dev.eclipse.org/mailman/options/orion-dev>, <mailto:orion-dev-request@eclipse.org?subject=unsubscribe>

I am trying to merge but I have a conflict. What do I do next? The git-status page has a link

http://orionhub.org/git/git-status.html#undefined

which is bug I reported. But even if the link was correct I don't know what to do.

jjb

Follow-Ups:
- Re: [orion-dev] git merge conflicts
  - From: John Arthorne

Prev by Date: Re: [orion-dev] 0.4 M1 available
Next by Date: Re: [orion-dev] git merge conflicts
Previous by thread: [orion-dev] HTML content assist
Next by thread: Re: [orion-dev] git merge conflicts
Index(es):
- Date
- Thread

Back to the top