Open vitalyte opened 7 months ago
What module is your suggestion regarding? Module 2.4
What is your suggestion for improving this module?
mkdir MergeConflict cd MergeConflict/ git init touch README.md echo "echo Hello" > README.md git add . git commit -m "first commit on master" git checkout -b new-branch echo "Hello World" > README.md git add . git commit -m "first commit on new-branch" git checkout master echo "Hola" > README.md git add . git commit -m "second commit on master" git merge new-branch
This "script" will create a merge conflict. Resolve the merge conflict so the text in README.md is "Hello World". Additional context Add any other context or screenshots about the suggestion here.
README.md
"Hello World"
What module is your suggestion regarding? Module 2.4
What is your suggestion for improving this module?
This "script" will create a merge conflict. Resolve the merge conflict so the text in
README.md
is"Hello World"
. Additional context Add any other context or screenshots about the suggestion here.