Closed tbarela closed 5 years ago
the submission dates seem to be out of wack. I'm sure this is multi able days of work, i would be impressed if you managed to do them commits within what github says but I'm sure you made multi-able days worth of commits as a singular commit.
if i used github as a tracking tool this would tell me how many hours between commits and how many commits you made within each day, but I been tracking time and how many Days you have spent on this clean up project.
I do intend to pay for all the time you have put into this project. though as i mentioned keep your time limited and don't spend too much time on this side project the pay checks will likely be weeks apart when there funded or "if" there funded..
I have given the other clients a strict time table on funding and also mentioned you can't work on this toolset without a paycheck.
So, far what i have logged including your previous logged time from the end of the project last time you have currently 64 hours of unpaid time with a recommendation to only put 4 hours daily during this project extension. (as i'm paying a fixed price for each milestone of the project)
I intend to pay extra each time i personally get a paycheck, i will give you micro-paychecks to pay down the clocked time, I'm more worried about you personally Tim as a person, back when i was able to I had given you reimbursements, though I'm unable to give that amount again as i recommended don't extensively build up unpaid hours or go over what you feel "400$" is worth to you.
As titled.
Before you blindly pull this, make sure you read this! This makes the other repos obsolete, outside of their tickets and documentation.
Dealing with the submodules / multiple repositories has been a royal pain. Changes often propagate into multiple repositories, requiring multiple commits. This also means the master repo has to do a commit as well, to match the changed submodules. Even for non code parts, like documentation, or bug fixes, it requires digging between multiple repositories, among other annoyances. Long story short, this has made things very painful...
So as part of the clean up effort this finally moves everything into one place.
I was able to preserve history, so everything is still there. You can view everything done up until these merges in each repository. I think I did something wrong though, and couldn't correlate histories from before / after these merge points. So file histories after this merge, will look like like a clean slate. If you need to view older history, look for the file's history before these merges. This isn't ideal, and I'm sure a git guru would point out 5 different ways I'm an idiot. But it is what is, this is a large step up in code quality. ..."Always leave the code in better shape than it was."
The other con is tickets will need to be moved from sub repos into this repository( and same with documentation ). But really, this stuff needs to be under the same roof, no getting around it.