Simple merge example

gistfile1.sh

#!/usr/bin/env bash
set -o errexit -o nounset -o pipefail

cd "$(mktemp --directory)"

git init
cat > test.txt <<EOF
alfa
bravo
charlie
delta
echo
foxtrot
golf
hotel
india
juliet
kilo
lima
mike
november
oscar
papa
quebec
romeo
sierra
tango
uniform
victor
whiskey
x-ray
yankee
zulu
EOF
git add test.txt
git commit --message "Initial commit"

git branch --track experiment
git checkout experiment
sed --in-place --expression 's/alfa/abraham/' test.txt
git commit --all --message "Experiment successful"
cat >> test.txt <<EOF
one
two
three
four
five
six
seven
eight
nine
EOF
git commit --all --message "Added numbers"

git checkout master
sed --in-place --expression 's/alfa/alpha/' test.txt
cat >> test.txt <<EOF
ærlig
østen
åse
EOF
git commit --all --message "Norwegian"
git rebase experiment || git mergetool