Programmer Humor

hideshow 13 child comments

[–] Archr@lemmy.world 5 points 2 months ago*

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.

parent

[–] wpb@lemmy.world 2 points 2 months ago* (last edited 2 months ago)

If you're comfortable with whatever text editor git uses, give git rebase -i a try.

parent

[–] Gonzako@lemmy.world [S] -1 points 2 months ago (10 children)

Would this also trigger (git rev-parse) to change? I have CI/CD listening to changes on the master branch

hideshow 10 child comments

parent

[–] waldfee@feddit.org 7 points 2 months ago* (last edited 2 months ago) (2 children)

When you have to amend a commit that you have already pushed you have to force push the amendment. That should then trigger the Pipeline

hideshow 2 child comments

parent

[–] tyler@programming.dev 6 points 2 months ago (1 child)

--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.

parent

hideshow 1 child comment

[–] doppydrop@lemmy.ca 2 points 2 months ago

This is good advice, I got too used to being a solo dev that once I worked with a larger team... mistakes were made.

parent

[–] Witchfire@lemmy.world 3 points 2 months ago (4 children)

Work off the master branch first, don't push to prod until you're ready to

hideshow 4 child comments

parent

[–] Gonzako@lemmy.world [S] 1 point 2 months ago (3 children)

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.

hideshow 3 child comments

parent

[–] Witchfire@lemmy.world 3 points 2 months ago (2 children)

...do you not use branches?

hideshow 2 child comments

parent

[–] Gonzako@lemmy.world [S] 1 point 2 months ago (1 child)

It's a collaboration tool and i'm not collaborating with anyone so why'd I bother going through the extra bells and whistles?

parent

hideshow 1 child comment

[–] Witchfire@lemmy.world 6 points 2 months ago

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.

parent

[–] VibeSurgeon@piefed.social 1 point 2 months ago (1 child)

Well, there's your problem.

Get yourself a nice button/endpoint you can hit to trigger CI/CD that way instead

parent

hideshow 1 child comment

[–] Gonzako@lemmy.world [S] 1 point 2 months ago

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.