https://github.com/bast/demo-git-conflict
Copy of https://github.com/ResearchSoftwareHour/demo-git-conflict which I will use during stream.
https://github.com/bast/demo-git-conflict
Last synced: about 1 year ago
JSON representation
Copy of https://github.com/ResearchSoftwareHour/demo-git-conflict which I will use during stream.
- Host: GitHub
- URL: https://github.com/bast/demo-git-conflict
- Owner: bast
- Created: 2021-05-06T17:22:28.000Z (about 5 years ago)
- Default Branch: main
- Last Pushed: 2021-05-06T19:14:52.000Z (about 5 years ago)
- Last Synced: 2025-01-28T02:42:47.179Z (over 1 year ago)
- Size: 3.91 KB
- Stars: 1
- Watchers: 2
- Forks: 0
- Open Issues: 0
-
Metadata Files:
- Readme: README.md
Awesome Lists containing this project
README
# Example to discuss and practice Git conflict resolution
There are two branches in addition to `main`: `improve-starters` and `improve-desserts`
and you can try these steps to discuss and practice conflict resolution:
- merging first `improve-starters` into `main`, then `improve-desserts` into `main`
- merging first `improve-desserts` into `main`, then `improve-starters` into `main`
- merging `improve-desserts` into `improve-starters` and vice versa
You can abort merges with `git merge --abort` and rewind `main` back with `git reset --hard origin/main`.
Also try to rebase the branches on top of `main`, "behind" each other.