From 78d4361f68a8a11e3521de4c48a02a06ebeb89be Mon Sep 17 00:00:00 2001 From: Arthur Daussy Date: Fri, 28 Nov 2014 11:25:03 +0100 Subject: [PATCH] [EMF Compage CLI] Adds a "Known issues" section. Adds a new "Known issues". Adds reference to bug 451159. Change-Id: Ie198e0ec75becc0aeb191ba0cc6e7cceb99e1c2f --- .../src/user/git-commands-involving-models.mediawiki | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/plugins/org.eclipse.emf.compare.doc/src/user/git-commands-involving-models.mediawiki b/plugins/org.eclipse.emf.compare.doc/src/user/git-commands-involving-models.mediawiki index 1261b944c..5d85fda40 100644 --- a/plugins/org.eclipse.emf.compare.doc/src/user/git-commands-involving-models.mediawiki +++ b/plugins/org.eclipse.emf.compare.doc/src/user/git-commands-involving-models.mediawiki @@ -270,4 +270,15 @@ Dispay help for this command. [--debug (or -d)] -Give the opportinity to connect a remote debugger to the logical cherry-pick application (using port 8123). \ No newline at end of file +Give the opportinity to connect a remote debugger to the logical cherry-pick application (using port 8123). + +=== Known issues === + +==== Cherry-pick empty commit ==== + +If you try to cherry-pick a commit that introduces changes that already belong to the worktree, the operation may stop on a dirty state. For example, if you have cherry-picked a commit that belongs to the ancestor tree of HEAD. The characteristics of this dirty state are: +# Wrong position of HEAD. +# Some modified files in the working tree (use ''git status'' command). + +This problem comes from a EGit/JGit problem (see [[https://bugs.eclipse.org/bugs/show_bug.cgi?id=451159 | bug 451159]]). +A workaround would be to find the previous position of HEAD using the ''git reflog'' command. Then, use the ''git reset --hard {$CommitId}''. This will reset HEAD to its previous position (''Use with caution''). -- 2.11.4.GIT