Skip to content

fix: correct git stage order on merge conflicts #2129

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.

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

Merged

Conversation

thurse93
Copy link
Contributor

@thurse93 thurse93 commented May 6, 2025

Fixes the stage order in which the git index gets updated on merge conflicts. This is a preparation PR for @pawamoy.

This change doesn't seem to break any tests, however im not familiar enough with the code base to write one that catches this condition.

fixes #2075

Copy link
Contributor

@pawamoy pawamoy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tried locally in VSCode, looking good 🙂 Thanks!

Copy link

codecov bot commented May 14, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.01%. Comparing base (5ac9e69) to head (56bd831).
Report is 10 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #2129   +/-   ##
=======================================
  Coverage   98.01%   98.01%           
=======================================
  Files          55       55           
  Lines        5949     5949           
=======================================
  Hits         5831     5831           
  Misses        118      118           
Flag Coverage Δ
unittests 98.01% <100.00%> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@sisp sisp merged commit 608b5d4 into copier-org:master May 14, 2025
21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fix visual conflict resolution for Jetbrains IDEs
3 participants