You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
15 lines
414 B
15 lines
414 B
5 years ago
|
#!/usr/bin/env bash
|
||
|
|
|
||
|
|
DIR="$(dirname "$(readlink -f "$0")")"
|
||
|
|
cd /tmp/demo
|
||
|
|
cp "${DIR}/../code-examples/python-merged.py" greeting.py > /dev/null
|
||
|
|
echo '$ vim greeting.py'
|
||
|
|
echo ' # Fix the conflict(s) #'
|
||
|
|
echo '$ git add greeting.py'
|
||
|
|
git add greeting.py
|
||
|
|
echo '$ git commit'
|
||
|
|
git commit -F .git/COMMIT_EDITMSG
|
||
|
|
echo '$ git log --oneline --all --graph'
|
||
|
|
git -c color.ui=always log --oneline --all --graph --decorate=short
|
||
|
|
|