https://github.com/cirosantilli/test-git-conflict

Generate various kinds of Git conflicts, including conflicts suitable to interactively test a merge resolution tool. More fun stuff at: https://github.com/cirosantilli/test-git-web-interface
https://github.com/cirosantilli/test-git-conflict

Last synced: about 2 months ago
JSON representation

Generate various kinds of Git conflicts, including conflicts suitable to interactively test a merge resolution tool. More fun stuff at: https://github.com/cirosantilli/test-git-web-interface

• Host: GitHub
• URL: https://github.com/cirosantilli/test-git-conflict
• Owner: cirosantilli
• Created: 2014-09-10T11:10:32.000Z (about 10 years ago)
• Default Branch: conflict
• Last Pushed: 2023-03-23T19:38:01.000Z (over 1 year ago)
• Last Synced: 2024-06-02T06:34:22.676Z (4 months ago)
• Language: Shell
• Homepage:
• Size: 199 KB
• Stars: 19
• Watchers: 3
• Forks: 6
• Open Issues: 1
• Metadata Files:
  • Readme: README.md

Awesome Lists containing this project

README

        
Generate various kinds of Git conflicts, including conflicts suitable

to interactively test a merge resolution tool.

The `./generate-conflicts.sh` script generates branches `conflict0`, `conflict1` and `conflict2`

with the desired conflicts. The generated branch tree will look like:

    conflict (current branch)

    |

    conflict0

    |

    +--------------+

    |              |

    conflict1      conflict2

**Running that script completely removes branches `conflict0`,

`conflict1` and `conflict2` and any unstaged changes**!

Don't make persistent changes to those branches: modify the script on branch `conflict` instead.

Rationale: it is too hard to generate conflicts manually without a script.

The script can be run from any branch. It always leaves you on branch `conflict2`,

from which you can then do `git merge conflict1` to generate the conflict.

Once you have generated the branches, you can force push all of them with `./deploy.sh origin`.