diff --git a/levels/merge/merge b/levels/merge/merge index 6be2eda..8b45d06 100644 --- a/levels/merge/merge +++ b/levels/merge/merge @@ -74,6 +74,9 @@ git branch -D main # Build a situation where you consumed a baguette, a coffee, *and* a donut. { git show HEAD:you | grep "You ate.*baguette"; } && { git show HEAD:you | grep "You drank.*coffee"; } && { git show HEAD:you | grep "You ate.*donut"; } +# Be on a merge commit. +test "$(git log --pretty=%P -n 1 HEAD | wc -w)" -ge 2 + [congrats] I wonder if you're more relaxed when you *sleep* in parallel timelines...