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.

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

feature/1963-resolve-merge-conflicts-of-different-track-files-automatically #415

Conversation

briemla
Copy link
Contributor

@briemla briemla commented Dec 6, 2023

OP#1963

Copy link
Member

@randy-seng randy-seng left a comment

Choose a reason for hiding this comment

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

Looks good! Just one question~

@briemla briemla requested a review from randy-seng December 11, 2023 17:52
@randy-seng randy-seng enabled auto-merge December 13, 2023 09:13
@randy-seng randy-seng merged commit bd481fb into main Dec 13, 2023
@randy-seng randy-seng deleted the feature/1963-resolve-merge-conflicts-of-different-track-files-automatically branch December 13, 2023 09:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants