]> git.cworth.org Git - lmno-todo/commit
projects / lmno-todo / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 69dd27d) | patch
Specify "union" merge strategy for the TODO file
authorCarl Worth <cworth@cworth.org>
Sat, 4 Jul 2020 16:37:52 +0000 (09:37 -0700)
committerCarl Worth <cworth@cworth.org>
Sat, 4 Jul 2020 16:37:52 +0000 (09:37 -0700)
commitf3a05ea071392077eb5629a34f33037acab7cab4
treeb62905bf6928ac1780ab4c34b0a4cb2b9b40a6e6tree | snapshot
parent69dd27dc1907064cc5742a8090b15db8d79c2bb6commit | diff
Specify "union" merge strategy for the TODO file

This gives the semantics that I described in the previous
commit. Conflicts will be resolved by keeping both sides in the file,
and without conflict markers. This is not expected to be perfect, but
is expected to be easy for people to fix up without having to think
much about it.
.gitattributes [new file with mode: 0644] blob
Unnamed repository; edit this file 'description' to name the repository.