https://github.com/walles/conflicts
Experiments in git conflicts resolution support
https://github.com/walles/conflicts
Last synced: 3 months ago
JSON representation
Experiments in git conflicts resolution support
- Host: GitHub
- URL: https://github.com/walles/conflicts
- Owner: walles
- Created: 2021-01-24T18:10:12.000Z (over 4 years ago)
- Default Branch: main
- Last Pushed: 2021-01-27T18:34:42.000Z (over 4 years ago)
- Last Synced: 2023-03-31T12:06:25.423Z (about 2 years ago)
- Language: Python
- Size: 11.7 KB
- Stars: 0
- Watchers: 2
- Forks: 0
- Open Issues: 1
-
Metadata Files:
- Readme: README.md
Awesome Lists containing this project
README
# Git conflict resolution experiments
Run `./show-original-change.sh` on a git repo with conflicts to display your
original change that is causing a conflict.
## Testing
Run `./test-show-original-change.py` to test `show-original-change.sh` on
various forms of conflicts.
# TODO
- Test a conflict in a file with spaces in its name
## DONE
- Add test for delete-edit conflict
- Add test for cherry picking conflicts
- Add test for edit-delete conflict
- Add test for when a new file is added in both branches, but with different
contents