Re: [orion-dev] git merge conflicts

[John Arthorne <John_Arthorne@xxxxxxxxxx>]

John J Barton wrote on 12/19/2011 04:36:06 PM:

> On Mon, Dec 19, 2011 at 12:55 PM, John Arthorne
<John_Arthorne@xxxxxxxxxx
> > wrote:
> > 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. 
>
> Sorry, I don't understand.
> 
> On the command line the file, eg readme.txt will be modified after
> the merge-failure. It will have >>> markers in the file.
You have 
> use an editor to make a new version of the file, typically without
> the markers.
> 
> But in Orion I only have the local version. I can't get the remote
> version, a diff, or a file with markers.  What am I doing wrong?

It works the same way in Orion. Doing a Git merge
will attempt to auto-merge. If this fails you will get files with >>>
markers showing you the conflicting areas. Conflicting files show up in
the git status page in an unstaged state with a red bidirectional arrows
next to them. Non-conflicting files will appear as staged. The conflicts
need to be resolved by hand and then staged/committed. From your confusion
I take it that this didn't happen for you, so maybe you've hit a bug. I
suggest entering a bug with any details you can give... screen shots, etc.

John