oh-my-git/levels/conflict/goal

6 lines
97 B
Text
Raw Permalink Normal View History

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