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

Add support for another sync mode #13

Open
devatherock opened this issue Feb 23, 2021 · 0 comments
Open

Add support for another sync mode #13

devatherock opened this issue Feb 23, 2021 · 0 comments
Labels
wontfix This will not be worked on

Comments

@devatherock
Copy link
Owner

Problem:
Sync fails when there had been any conflict resolution done in the source branch without using rebase

Solution:
Use cherry-pick as the default sync mode which will continue doing what the current code does. Introduce a sync mode that works by merging the contents of modified files. Call it file-merge. Find files modified in a commit using command git diff-tree --no-commit-id -r <commitSha>. The output of the command looks like below:

:100644 100755 772e30bf04d0b60b12ce56057dc68067f3902ff3 772e30bf04d0b60b12ce56057dc68067f3902ff3 M	path/to/file.sh

The fields are old file mode, new file mode, old file hash, new file hash, the type of change(A/M/D - Added/Modified/Deleted) and path to file. When only file mode has changed, old file hash and new file hash will be the same

@devatherock devatherock added enhancement New feature or request wontfix This will not be worked on and removed enhancement New feature or request labels Jun 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
wontfix This will not be worked on
Projects
None yet
Development

No branches or pull requests

1 participant