From 69dd27dc1907064cc5742a8090b15db8d79c2bb6 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Sat, 4 Jul 2020 08:35:26 -0700 Subject: [PATCH] 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. --- TODO | 1 + 1 file changed, 1 insertion(+) create mode 100644 TODO diff --git a/TODO b/TODO new file mode 100644 index 0000000..556c796 --- /dev/null +++ b/TODO @@ -0,0 +1 @@ +Implement auto push/pull for TODO file. -- 2.43.0