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

Solution for Git conflicts #1

Open

GeReV opened this issue Oct 4, 2016 · 0 comments

GeReV commented Oct 4, 2016

Came up with a solution to merge files after a merge conflicts arises between branches.

In such a case you will have to following form:

<<<<<<< HEAD
encrypted version 1
=======
encrypted version 2
>>>>>>> branch-a

In such a case I suggest the following solution:

Extract both encrypted versions.
Decrypt both versions in-memory (exit if one does not decrypt properly).
Perform a line-for-line merge operation. Code for this already exists.
In case of a per-line conflict, resolve interactively with the user.

Will submit a PR for this when I get the time.

The text was updated successfully, but these errors were encountered:

GeReV mentioned this issue

Git conflict resolution code #2

Open

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