#!/bin/bash

set -e
mkdir branchingrepo &>/dev/null
cd branchingrepo
git init --initial-branch main
touch file1 &>/dev/null
git add file1 &>/dev/null
git commit -m 'initial commit' &>/dev/null



cd ..
mkdir conflictrepo
cd conflictrepo
git init --initial-branch main &>/dev/null
echo 'base line' >file1
git add . &>/dev/null
git commit -m 'initial commit' &>/dev/null
git branch mybranch &>/dev/null
echo 'added on main' >>file1
git commit -am 'add on main' &>/dev/null
git switch mybranch &>/dev/null
echo 'added on mybranch' >>file1
git commit -am 'add on mybranch' &>/dev/null
git switch main &>/dev/null
set +e
git merge mybranch &>/dev/null
set -e

clear

echo "Created branchingrepo and conflictrepo."