Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cfef3633f9 |
+3
-2
@@ -1,3 +1,4 @@
|
|||||||
# Git never reports a conflict in TODO.md: read the merged entries after every
|
# Every PR adds an entry at the top of TODO.md's Completed Steps; union keeps
|
||||||
# merge or rebase, because an entry can land in the middle of another.
|
# both sides instead of conflicting. Git never reports a conflict here: read
|
||||||
|
# the merged entries after every merge or rebase.
|
||||||
TODO.md merge=union
|
TODO.md merge=union
|
||||||
|
|||||||
Reference in New Issue
Block a user