All geek questions in one place

What does “possibly due to conflict resolution” mean in an empty cherry gut message?

When you try to execute a cherry, select a commit that is already in the current branch, message

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

.

The meaning of this is clear.

However, the message clearly reflects a different situation, and I do not understand another case - perhaps because of the resolution of conflicts. How can conflict resolution make a message blank?

+6
source share
1 answer

When you select a commit, git tries to apply the patch. Three results are possible:

  • unchanged, because the ancestors already had the patch (for example, when trying to select a cherry twice)
  • some changes made
  • file conflicts

If there are conflicts in the files, you can edit them, which is called "conflict resolution". One way to edit them is to remove all the changes that a cherry pick would add. When you do this, you end up not changing anywhere else, but still in the process of choosing. That is why this hint says "perhaps because of the resolution of the conflict."

+6
source

Source: https://habr.com/ru/post/1264021/

More articles:


All Articles