Re: [orion-dev] git merge conflicts

[John Arthorne <John_Arthorne@xxxxxxxxxx>]

John J Barton wrote on 12/19/2011 10:37:02 AM:
> 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.

Orion Git resolves conflicts exactly like git command
line tools. Fix up and commit the conflicting files manually as you would
do on the command line.

John A