Gist to create a Git reppo and rename and modify a file on 2 different branches

git-rename-test.sh

#!/bin/sh
 
##
# Gist to create a Git reppo and rename and modify a file on 2 different branches
##
 
mkdir renameTest
cd renameTest
git init
 
# Init project
echo "base" > data.txt
git add -A
git commit -m "Initial project"
 
# Branch and rename file
git checkout -b myBranch
mv data.txt data-renamed.txt
git add -A
git commit -a -m "renamed"
 
# Make a change to renamed file
echo "remote" >> data-renamed.txt
git add -A
git commit -a -m "myBranch commit"
 
# Checkout master and make a change to original file
git checkout master
echo "local" >> data.txt
git commit -a -m "local"
 
# Merge
git merge myBranch