Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Mark conflicted files as unmerged #1396

Merged
merged 3 commits into from
Nov 22, 2023

feat: Conflicts on updates now appear as git merge conflicts, also on…

6eaa71d
Select commit
Loading
Failed to load commit list.
Merged

feat: Mark conflicted files as unmerged #1396

feat: Conflicts on updates now appear as git merge conflicts, also on…
6eaa71d
Select commit
Loading
Failed to load commit list.
Codecov / codecov/patch succeeded Nov 21, 2023 in 0s

100.00% of diff hit (target 97.24%)

View this Pull Request on Codecov

100.00% of diff hit (target 97.24%)

View more details on Codecov