Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Show files as conflicted in git panel when discard undo creates merge conflicts, handle various edge cases - #563

Merged
kuychaco merged 32 commits into
masterfrom
ku-show-conflicts-in-git-panel
Mar 3, 2017
Merged

Show files as conflicted in git panel when discard undo creates merge conflicts, handle various edge cases#563
kuychaco merged 32 commits into
masterfrom
ku-show-conflicts-in-git-panel

Fix bug undoing discard for file in subdirectory (fixes #588)

0003447
Select commit
Loading
Failed to load commit list.

Workflow runs completed with no jobs