Usually my leo repository shows as
/n/git/leo-editor (master) not
/n/git/leo-editor (master|MERGING)
OK I read up on *git checkout --theirs*
and tried it out. You can see from the git log I did a *git reset --hard* *and
I am back to where I started.*
git log:
lewis@Argon MINGW64 /n/git/leo-editor (master|MERGING)
$ git checkout --theirs leo/test/unitTest.leo leo/core/leoColorizer.py
leo/core/
commit_timestamp.json
lewis@Argon MINGW64 /n/git/leo-editor (master|MERGING)
$ git pull
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
lewis@Argon MINGW64 /n/git/leo-editor (master|MERGING)
$ git reset
Unstaged changes after reset:
M leo/core/commit_timestamp.json
M leo/core/leoAtFile.py
M leo/core/leoColorizer.py
M leo/core/leoCommands.py
M leo/core/leoGlobals.py
M leo/test/activeUnitTests.txt
M leo/test/unitTest.leo
lewis@Argon MINGW64 /n/git/leo-editor (master)
$ git pull
error: Your local changes to the following files would be overwritten by
merge:
leo/core/commit_timestamp.json
leo/core/leoAtFile.py
leo/core/leoColorizer.py
leo/core/leoCommands.py
leo/core/leoGlobals.py
leo/test/activeUnitTests.txt
leo/test/unitTest.leo
Please commit your changes or stash them before you merge.
Aborting
lewis@Argon MINGW64 /n/git/leo-editor (master)
$ git reset --hard
HEAD is now at 4b5b74408 Re-enabled continuations for multi-line
constructructs.
They are needed for docstrings!
lewis@Argon MINGW64 /n/git/leo-editor (master)
$ git pull
Auto-merging leo/test/unitTest.leo
CONFLICT (content): Merge conflict in leo/test/unitTest.leo
Auto-merging leo/core/leoColorizer.py
CONFLICT (content): Merge conflict in leo/core/leoColorizer.py
Auto-merging leo/core/commit_timestamp.json
CONFLICT (content): Merge conflict in leo/core/commit_timestamp.json
Automatic merge failed; fix conflicts and then commit the result.
lewis@Argon MINGW64 /n/git/leo-editor (master|MERGING)
Thanks
Lewis
--
You received this message because you are subscribed to the Google Groups
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send email to [email protected].
Visit this group at https://groups.google.com/group/leo-editor.
For more options, visit https://groups.google.com/d/optout.
