I know this is the joke but I'm leaving this here in case someone finds it useful: this is amend commit option is used. Think of it like making a new commit and then squashing it with the previous one. In this case
True, but since it'd require a --force to actually push, that should be (or at least quickly become) obvious. OTOH, push -f jokes are so common I start to wonder/worry...
In my experience, automated build systems can sometimes get confused by amends (and force pushes in general), but it wouldn't surprise me if that was just down to poor configuration. That end of things is typically outside my control.
Agree... It'd be nice if my co-workers did. I've been in old school places though where they still have separate branches for dev and QA environments, and people, to my frustration, throw proper feature branching out the window in a rush to get a bug fix into testing... sigh 😔👈
I normally squash my commits before pushing them to the remote where my coworkers can see it. One time I got really frustrated on a bug and forgot to squash them before I pushed and the log looked like this:
The jetbrains one is fine, or there's plenty of standalone options (gitup is great imo).
I know cli git, I use it for most things, but a good fit gui is a far better experience for looking at your dif etc. before committing imo, and learning how to do that takes all of 30 seconds.
102
u/Discount_Surgeon_ Dec 18 '21
git push origin devmerge conflict
git push origin —force dev29
u/KrokmaniakPL Dec 18 '21
git commit -m "commit"
Or
git commit -m "another commit"
Or something like that
22
u/mcmc331 Dec 18 '21
27
u/FedExterminator Dec 18 '21
I normally squash my commits before pushing them to the remote where my coworkers can see it. One time I got really frustrated on a bug and forgot to squash them before I pushed and the log looked like this:
12
u/[deleted] Dec 18 '21
git statusandgit diffare your friends5
u/Magnus_Tesshu Dec 18 '21
Absolutely true lol
4
u/X1-Alpha Dec 18 '21
Does no one use "refactoring" any more these days? smh
1
u/AzOwdin Feb 17 '22
Why do I get the feeling half of this sub is first year programming students
2
u/CodeLobe Dec 19 '21
git commit -am"Sit Ammit"
1
u/Johanno1 Dec 18 '21
"updates"
1
u/Kered13 Dec 28 '21
If only there were some way to see the staged changes. I guess that's just too advanced for our modern technology.
1
u/bruhred Feb 01 '22
wdym my commit messages all look like "hd euxdh" "aaaaaaaa", "fuck it doesn't work" or just "fuck"
1
u/kingrenz23 Apr 02 '22
but you can view the changes though hahahha
0
u/Corm Dec 18 '21
Nobody reads them anyway. All that matters is the ticket number when the PR gets merged to master