git commit --amend--no-edit and git push --force-with-lease
No-edit skips opening an editor for the commit message and just reuses the same message.
Force-with-lease will force push but only if your local is not missing commits that remote has. Ie other people haven’t pushed anything since you last pulled.
Well, prod is luckily the people I have next room. I made the setup so changes get uploaded quickly. I could do branches and all that stuff?
Yeah, but i’d rather not work to work and just get it out the door. What my setup is for is that changes get pulled off the master branch and deployed without an apparent interruption of service.
I see collaboration tools just the same as abstractions, you don’t use them just to use them. They need to solve a problem.
VCS’s are organizational tools as much as they are collaboration tools. You should learn it and use it to improve your coding abilities through better management.
You’re saying it’s a problem but i’m not really reading why. While the idea of a massive button to push changes is fun having the master branch be production is a concrete idea i’ve grown fond of, iteration is fast, both at testing and deployment.
Yeh I use git (
git commit --amend)git commit --amend --no-editandgit push --force-with-leaseNo-edit skips opening an editor for the commit message and just reuses the same message.
Force-with-lease will force push but only if your local is not missing commits that remote has. Ie other people haven’t pushed anything since you last pulled.
If you’re comfortable with whatever text editor git uses, give git rebase -i a try.
Would this also trigger (
git rev-parse) to change? I have CI/CD listening to changes on the master branchWhen you have to amend a commit that you have already pushed you have to force push the amendment. That should then trigger the Pipeline
–force-with-lease though, not just force… It’s a good habit to have because then when you are working with other people you won’t fuck everything up.
This is good advice, I got too used to being a solo dev that once I worked with a larger team… mistakes were made.
Work off the master branch first, don’t push to prod until you’re ready to
Well, prod is luckily the people I have next room. I made the setup so changes get uploaded quickly. I could do branches and all that stuff?
Yeah, but i’d rather not work to work and just get it out the door. What my setup is for is that changes get pulled off the master branch and deployed without an apparent interruption of service.
I see collaboration tools just the same as abstractions, you don’t use them just to use them. They need to solve a problem.
…do you not use branches?
It’s a collaboration tool and i’m not collaborating with anyone so why’d I bother going through the extra bells and whistles?
VCS’s are organizational tools as much as they are collaboration tools. You should learn it and use it to improve your coding abilities through better management.
Well, there’s your problem.
Get yourself a nice button/endpoint you can hit to trigger CI/CD that way instead
You’re saying it’s a problem but i’m not really reading why. While the idea of a massive button to push changes is fun having the master branch be production is a concrete idea i’ve grown fond of, iteration is fast, both at testing and deployment.