oh-my-git/levels/conflict/goal
2020-09-16 16:16:11 +02:00

5 lines
97 B
Text

git merge alternative
echo blue-green > bikeshed_color
git add .
git commit -m "Merge"
git prune