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

Merge git tool #144

Open

OroArmor opened this issue Aug 31, 2023 · 0 comments

Labels

Member

OroArmor commented Aug 31, 2023

Git doesn't understand mappings so a way to merge two branches, selecting between conflicting names would be amazing.

It looks like custom merge strategies are possible but not easily transferable between computers: https://stackoverflow.com/questions/23140240/git-how-do-i-add-a-custom-merge-strategy

ix0rai added the enhancement label

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment