jarihaavisto/demo-git-conflict
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1 Commit 1 Branch 0 Tags
7f8afce0aa2d361e6299be79ee685a22582c7529
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Jari Haavisto 7f8afce0aa initial commit
2023-11-24 10:15:53 +02:00
src
initial commit
2023-11-24 10:15:53 +02:00
README.md
initial commit
2023-11-24 10:15:53 +02:00

README.md

DEMO: Git Conflict

  1. Pull the repository

  2. Checkout to a feature branch

  3. Make changes

  4. Checkout to main

  5. Checkout to another feature branch

  6. Make conflicting changes

  7. Merge the changes

  8. Checkout to main

  9. Checkout to first feature branch

  10. Merge the changes

  11. Resolve conflict

Description
No description provided
Readme 26 KiB
Languages
TypeScript 100%