i_isaev@WS-SMT-0064 MINGW32 /d/Sources/Cpp/PathFinder (master|CHERRY-PICKING)

$ git diff

* Unmerged path src/Utils/Strings.h

i_isaev@WS-SMT-0064 MINGW32 /d/Sources/Cpp/PathFinder (master|CHERRY-PICKING)

$ git commit

U       src/Utils/Strings.h

error: commit 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.

i_isaev@WS-SMT-0064 MINGW32 /d/Sources/Cpp/PathFinder (master|CHERRY-PICKING)

$ git rm src/Utils/Strings.h

src/Utils/Strings.h: needs merge

rm 'src/Utils/Strings.h'

i_isaev@WS-SMT-0064 MINGW32 /d/Sources/Cpp/PathFinder (master|CHERRY-PICKING)

$ git commit

On branch master

Your branch and 'origin/master' have diverged,

and have 4 and 1 different commit each, respectively.

  (use "git pull" to merge the remote branch into yours)

You are currently cherry-picking commit 8e64f0d.

 

nothing to commit, working directory clean

The previous cherry-pick is now empty, possibly due to conflict resolution.

If you wish to commit it anyway, use:

 

    git commit --allow-empty

 

Otherwise, please use 'git reset'

i_isaev@WS-SMT-0064 MINGW32 /d/Sources/Cpp/PathFinder (master|MERGING)

$ git merge 8e64f0d

fatal: You have not concluded your merge (MERGE_HEAD exists).

Please, commit your changes before you merge.