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

Support nested conflicts aka git "temporary merge branches" #24

Open
yairchu opened this issue Dec 9, 2019 · 0 comments
Open

Support nested conflicts aka git "temporary merge branches" #24

yairchu opened this issue Dec 9, 2019 · 0 comments
Labels
enhancement

Comments

@yairchu
Copy link
Collaborator

yairchu commented Dec 9, 2019

See this question on stackoverflow for more information on the issue.

When I had this situation I created this branch which adds support for it, but I haven't encountered these in a while and would feel more comfortable merging this change in when I face the issue again.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
enhancement
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@yairchu