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

Jump to bottom

Allow conflicts to be resolved on a non-checked-out PR #5858

Merged
merged 5 commits into from
Apr 5, 2024
Merged

Allow conflicts to be resolved on a non-checked-out PR #5858

merged 5 commits into from
Apr 5, 2024

Conversation

alexr00
Copy link
Member

@alexr00 alexr00 commented Mar 22, 2024

Fixes #5802

@alexr00 alexr00 self-assigned this Mar 22, 2024
alexr00
alexr00 commented Mar 22, 2024
View reviewed changes
Copy link
Member Author

@alexr00 alexr00 left a comment

Choose a reason for hiding this comment

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

Todos (mostly for subsequent PRs):

  • Code clean up
  • Add progress
  • Polish tree view
  • Allow resolving of renames

alexr00

This comment was marked as duplicate.

Sign in to view

alexr00
alexr00 commented Apr 5, 2024
View reviewed changes
Copy link
Member Author

@alexr00 alexr00 left a comment

Choose a reason for hiding this comment

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

Merge conflicts resolved by using the changes in this PR 🚀

@alexr00 alexr00 marked this pull request as ready for review April 5, 2024 09:44
@alexr00 alexr00 enabled auto-merge (squash) April 5, 2024 09:44
@alexr00 alexr00 merged commit bb0a2fb into main Apr 5, 2024
3 checks passed
@alexr00 alexr00 deleted the alexr00/issue5802 branch April 5, 2024 09:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jrieken jrieken jrieken approved these changes

Assignees

@alexr00 alexr00

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Offer "resolve conflicts" even when the PR is not checked out
2 participants
@alexr00 @jrieken