https://github.com/marckassay/demoofgitconflicts
Replicates by automation the following three Git conflicts: 'content', 'add/add' and 'modify/delete'.
https://github.com/marckassay/demoofgitconflicts
demonstration git merge-conflicts powershell
Last synced: 4 months ago
JSON representation
Replicates by automation the following three Git conflicts: 'content', 'add/add' and 'modify/delete'.
- Host: GitHub
- URL: https://github.com/marckassay/demoofgitconflicts
- Owner: marckassay
- License: mit
- Created: 2017-05-28T03:37:20.000Z (over 8 years ago)
- Default Branch: master
- Last Pushed: 2018-02-27T02:57:08.000Z (almost 8 years ago)
- Last Synced: 2025-07-06T20:04:25.353Z (7 months ago)
- Topics: demonstration, git, merge-conflicts, powershell
- Language: PowerShell
- Size: 78.1 KB
- Stars: 1
- Watchers: 2
- Forks: 0
- Open Issues: 0
-
Metadata Files:
- Readme: README.md
- License: LICENSE
Awesome Lists containing this project
README
# DemoOfGitConflicts
Replicates by automation the following three Git conflicts:
* CONFLICT (content)
* CONFLICT (add/add)
* CONFLICT (modify/delete)
## Instructions
* Fork this project
* Clone your forked project
* and dot-source AutomateCloning file!
## Explanation
When the ps1 file is dot-sourced, it will emulate Git activities by creating authors named Alice and Bob. Alice will create and push careless mistakes that are in her work. Bob will pull and see those mistakes which he then corrects. When he pushes he will recieve the three conflicts mentioned above.
## Intentions
To demostrate quickly and effortlessly conflicts that occur when contributing to a centralized repository. Also so that you're mindful of your actions which could be destructive when using Git.
I created this project during the time I was working on a bug fix for VSCode. That bug was related to Git conflicts which replicating was cumbersome.
## Roadmap
* Demonstrate detached branches in a merge conflict
* Recommended solutions for each scenario