git checkout -b other
t-some-changes other '' -other
echo 'other-conflict' >>debian/zorkmid
git commit -m 'other-conflict' debian/zorkmid
git checkout -b other
t-some-changes other '' -other
echo 'other-conflict' >>debian/zorkmid
git commit -m 'other-conflict' debian/zorkmid