Menu
git sometimes gives me this message on a conflict (during a revert or cherry pick)
hint: after resolving the conflicts, mark the corrected paths What does this mean?
793
hint: after resolving the conflicts, mark the corrected paths hint: with `git add <paths>` or `git rm <paths>` hint: and commit the result with `git commit`. As if running " git commit " to conclude the resolution of this single step were the end of the story.
Resolve the conflicts. Resume: Depending on the command that was executed (e.g. rebase, merge, cherry-pick), you will usually need to add the files and call something like rebase --continue or cherry-pick --continue.
On the command line, a simple "git merge --abort" will do this for you. In case you've made a mistake while resolving a conflict and realize this only after completing the merge, you can still easily undo it: just roll back to the commit before the merge happened with "git reset --hard " and start over again.
Yes, at least with the standard git setup. You cannot cherry-pick while there are conflicts. Furthermore, in general conflicts get harder to resolve the more you have, so it's generally better to resolve them one by one. That said, you can cherry-pick multiple commits at once, which would do what you are asking for.
This means that you need to explicitly tell Git that you've resolved a conflict at each file or folder (that is path).
Showing the list of yet unresolved conflicts:
git status Marking a conflict as resolved.
File or all files in a folder should be left and all conflicts are resolved:
git add File or folder should be removed:
git rm Next step:
git commit because some files are in conflict ,you can type git status to find out what is the file with conflict, and after the conflict was sovled ,just git commit -m sth log ,at last git cherry-pick your-commmit-id . see details http://wiki.koha-community.org/wiki/Using_Git_Cherry_Pick#Resolve_conflicts
32
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
