-
Notifications
You must be signed in to change notification settings - Fork 8
Issues: Peaker/git-mediate
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
Author
Label
Projects
Milestones
Assignee
Sort
Issues list
Merge of type-change (data->symlink) and data-change (data->data) handled incorrectly
bug
#28
opened Mar 2, 2021 by
Peaker
Support nested conflicts aka git "temporary merge branches"
enhancement
#24
opened Dec 9, 2019 by
yairchu
after configuring merge.conflictstyle automatically with -s, git-mediate causes parse error
enhancement
question
#23
opened Aug 9, 2018 by
eshels
ProTip!
Type g p on any issue or pull request to go back to the pull request listing page.