File to create a merge conflict

create_merge_conflict.sh

# Create a Directory
mkdir git-repo
cd git-repo

# Initialize Git repository
git init

# Create a file
touch my_code.sh
git add my_code.sh
echo "echo Hello" > my_code.sh
git commit -am 'initial'

# Create a new branch
git checkout -b new_branch
echo "echo \"Hello World\"" > my_code.sh
git commit -am 'first commit on new_branch'

# Move to master
git checkout master
echo "echo \"Hello World\!\"" > my_code.sh
git commit -am 'second commit on master'
git merge new_branch