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.
Refresh
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

98.24% of diff hit (target 97.24%)

View this Pull Request on Codecov

98.24% of diff hit (target 97.24%)

Annotations

Check warning on line 185 in copier/tools.py

See this annotation in the file changed.

@codecov codecov / codecov/patch

copier/tools.py#L185 

Added line #L185 was not covered by tests
View more details on Codecov