I have a few more things Iād like to do for tags, but I will get it done soon and let you know when it is 100% ready to go in to your repo. Also, we will have to work together to do something in the configuration settings of your repo to make this work. I will send those steps in a PGP message
No worries. For me git work is automatic, and it adds minimal extra work. I dont mind squashing things, rebasing, pull requests, etc. I appreciate clean git histories and commits that are well written, but also I am happy to do what works best for you.
I do think if the project were to grow, implementing some git best practices would be a good thing. But if only a few people are working who know the project well, I donāt think it is a big deal.
Itās because I keep rebasing on top of your branch. imagine that 1-4 are the order of commits
my repo looks like:
- patrick commit 1
- patrick commit 2
- rob commit 3
but you do an upstream commit (3) and I want to put my commit on top of it, when I rebase it looks like
- patrick commit 1
- patrick commit 2
- patrick commit 3 (from upstream repo)
- rob commit 4
Now when I push, git says the histories do not line up. This requires a force push. It is the way git works, basically warning that I have changed history and this is not something it allows you to do unless you know what you are doing (hence the -f
flag)
Compared to the size of the VMs, 50mb is no big deal. The VPS has 100gb disk. The Gateway, Workstation, and codebases (binary and derivative maker) are a much larger percentage of storage than logs. But again, self healing non issue.
As for making readable logs, that is a subjective thing and if you feel it should be done in some kind of way I am happy to oblige. I just wanna help make your life more efficient. I will likely never have the security understanding and deep knowledge you do of the OS, so I am just trying to build tools that help you move faster with less time doing manual building/testing.
git used to drive me crazy, but every job Iāve worked has strict git guidelines so I really dont even think much about it anymore. itās mostly automatic. You can fetch my branch, cherry pick my commit, or have an upstream PR at any point you want. It is all easy peasy for me. Whatever is best for you is best for me, just ask !
Give me like a day or two to get everything tidy and we can merge it in to your master
Cheers