Carl Worth [Sun, 5 Jul 2020 18:30:04 +0000 (11:30 -0700)]
Removing the .gitattributes file
I'm exploring a more robust approach for this feature, where the nogit
repository need not maintain this file, but instead, nogit itself will
ensure that all files have a merge=union driver applied during the
merge operation.
Carl Worth [Sat, 4 Jul 2020 16:37:52 +0000 (09:37 -0700)]
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.
Carl Worth [Sat, 4 Jul 2020 15:35:26 +0000 (08:35 -0700)]
Initial import of a repository to track a TODO file for LMNO games.
I'm adding this new repository so that we can collaborate on the state
of TODO items, (with shared visibility of ideas and progress). At the
same time, I want to maintain the lightweight workflow I've had for
TODO in the past outside of git.
Specifically, I intend to use this repository in a couple of unique
ways, (that I would normally never use for a git repository where I
care about the git history):
1. Commit messages need not be meaningful
I want to allow users to use an automated tool that will do
things such as create a commit every time they modify the TODO
file. Ussers might also make manual commits and can make the
commit message as detailed as they like. And the automated
tools might also be clever about the commit messaes they
construct, (such as indicating whether an item was added or
removed). But for now, I intend to have it acceptable to have
content-free commit messages.
2. Conflicts can be resolved without user intervention
Again, for purposes of a lightweight workflow, I'm fine with
an automated tool doing a dumb merge. I'd like something that
keeps the information from both sides of any conflict, but
doesn't litter the file with conflict markers.
projects / lmno-todo / log