gitbutler
gitbutler copied to clipboard
Unapplied conflicting branch cannot be applied, contradicting label saying it can.
If an unapplied branch has a conflict with the workspace, then it gains a "Conflict 🔒" label, with a tooltip saying "Applying this branch will add merge conflict markers that you will have to resolve". However, trying to apply it will instead fail with the toast: "Failed to apply branch Error: Branch [branch id] is in a conflicing [sic, see #3523] state".
Either the tooltip is incorrect, and it should instead explain that resolving conflicts between virtual branches is not supported, or the tooltip is correct, and this is a bug.
Steps to reproduce:
- Change a line in a file
- Commit the change to a virtual branch, then unapply the branch
- Make a different change to the same line
- Try to apply the first virtual branch