Skip to content

Commit

Permalink
Confilcts resolving is applied for cherry-pick too
Browse files Browse the repository at this point in the history
  • Loading branch information
Ivan Yelizariev committed Mar 7, 2016
1 parent aecd612 commit c2bf2fe
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion docs/git/conflicts.rst
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Conflict resolving
==================

After making ``git merge`` there could be conflicts, because some commits try to make changes on the same line. So, you need to choose which change shall be use. It could be one variant, both variants or new variant.
After making ``git merge`` or ``git cherry-pick`` there could be conflicts, because some commits try to make changes on the same line. So, you need to choose which change shall be use. It could be one variant, both variants or new variant.

What to do if you got conflicts:

Expand Down

0 comments on commit c2bf2fe

Please sign in to comment.