jarihaavisto
/
demo-git-conflict
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
1 Commit
1 Branch
0 Tags
26 KiB
TypeScript 100%
 
main
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '7f8afce0aa'
${ noResults }
Go to file
Jari Haavisto 7f8afce0aa initial commit 2 years ago
src initial commit 2 years ago
README.md initial commit 2 years ago

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