Skip to content

GitLab

Closed
Created by Sven Strickroth@mrtuxOwner

Rebase / Cherry Pick dialogs should update "conflict" status when conflicts are resolved

By Jake.St... on November 16, 2011 23:18 (imported from Google Code)

What steps will reproduce the problem?

  1. Cherry pick a commit with conflicts against the current branch.
  2. Double click a red line entry, resolve the conflict, and save.

Expected that the red line turns blue, and "conflicted" changes to "resolved" for the selected item. Currently the list remains unchanged.

Using TortoiseGIT 1.7.5, x64.

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information