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.
14 lines
299 B
Markdown
14 lines
299 B
Markdown
# 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 |