Reputation: 1233
I have a 'plan' or 'todo' file in the root of my project (python, though that's not really relevant to this specific question). The scope of the project is pretty small, I'm the only programmer working on it.
This text file just contains a list of tasks which need to be done. When a bug is reported, I'd add it to the list. Feature requests as well. Permanent features of this list are things like '100% test coverage' etc. All bugs/requests are generated through direct contact with me (face-to-face from users of the system, or perhaps, and rarely, by email).
This works fine for the naive single-dev single-master-branch workflow, but I'm experimenting with using one branch per hotfix/feature (as well as a develop branch for larger things), and I realize this doesn't seem to gel well with a single 'todo' file. Mainly because the question is, when adding a new bug, which branch should I modify?
Here's the options as I see them:-
Don't track the 'todo' file at all.
Modify the 'todo' file exclusively in the master branch.
Modify the 'todo' file as the first action in any new branch (hotfix/feature) creation.
1 doesn't seem ideal, especially if I'm working from multiple machines (oh, I forgot because I've been on my desktop more often recently, great excuse). May as well keep the file somewhere on dropbox in this case. 2 seems fine, but increases the amount of pointless rebasing if I'm going to be hanging around in a feature/develop branch for some time. 3 risks me forgetting a branch exists and not having any reminders in a 'todo' file to jog that memory.
Is there something I'm missing here?
Upvotes: 5
Views: 2089