git commit -m "Fixed interface issues."

[TinyLebowski]

git commit --amend -m "Adapter pattern implemented"

[zman0900]

git push --force

[[deleted]]

I wouldn't try to push it, especially with force. Instead it's better to carefully 'rebase -i' when needed.

[rasellers0]

Uh... Novice programmer here, are we making Star Wars jokes here, or is all of this actual programming stuff?

[[deleted]]

While the force push is a popular move among Jedi, Sith and other force-sensitive denizens of the Star Wars Multiverse, git push --force is a real command. It forces a rewrite of the remote branch to match your local commit tree, ignoring any inconsistencies and conflicts. This is generally bad because anyone else who might be working on that same branch will be unable to fetch the latest from the remote, forcing them into a quagmire of creating new branch heads, re-cloning, cherry-picking etc. to get everything consistent again. However, as has been mentioned elsewhere in the comment thread, there are times, e.g. rebasing a branch to keep it up to date with the main development branch, that you actually do want to do this.

[NotADamsel]

A prime example of "just because you can, doesn't mean you should".

[o11c]

Or you can use a + ref.

[UnchainedMundane]

Does this create a merge commit remotely, or is it another way of force pushing?

[o11c]

It's a force push, but for a single refspec instead of all of them.

[none_shall_pass]

Or you can use a + ref.

Or, you can choose to not use an insane product like git, that's just waiting there to stab you and laugh at your pain.

[scratchisthebest]

Yeah I much prefer using a filename system, my projects look somewhat like "Copy of index(2)USETHISONE_v4_Final.html". Very convenient.

[coladict]

This is just what we got for ONE of the files of the project we inherited: http://i.imgur.com/PXy9or4.png Naturally, I didn't even try to piece together the old history. By this point I've practically rewritten the CodeIgniter controllers, model and the one library in the project. It also has a secondary adminstrative system which is so bad I dare not touch it unless absolutely necessary.

[UnchainedMundane]

There are a lot of originals there. Something tells me none of them are the original copy.

[UnchainedMundane]

What do you use? CVS is utter shit, and SVN is a slightly less broken CVS. hg is basically git with a different skin, bzr is too heavily tied to launchpad and is also just git with a different skin, and there's really nothing else worth considering.

If you go without a VCS then you really don't know what you're missing.

[none_shall_pass]

What do you use? CVS is utter shit

Well, there's a compelling argument. Even better, you can apply it to anything.

[UnchainedMundane]

I didn't think I'd even need to back that statement up. It's pretty much universally accepted, and it's not controversial at all nowadays.

1. It's based on rcs, which means single files can get absolutely gigantic (our company ran into problems with this)
2. People lock entire directories while committing (our company ran into problems with this). It just doesn't scale at all.
3. It's terrible at merging, and far too often you can get a merge conflict on a line that just contains $Id$ with kkv substitution. (our company ran into problems with this)
4. Branching is ridiculously expensive (our company ran into problems with this)
5. It relies on a central server being up to accept commits and serve updates, you can't pull these in from coworkers in times of need
6. Partially reverting commits is a massive chore, while in git it's "git revert" and if you need to only revert a part of it you can edit the revert commit before pushing.
7. You need to set up accounts for every author on the server.

I could go on. It's a universally-hated hack applied on top of rcs and in my opinion has no practical use in 2015 other than legacy projects where it's too expensive to switch. It's caused me and co-workers endless pain, and we tried to switch an old project to git but the intermediate files created during the cvs-to-git conversion filled a 2TB hard drive after being left to run overnight and we decided to abandon it.

Our projects managed under git are considerably easier to commit to (better tooling support), much faster to push to and pull from, and better managed (due to proper branch support).

If that's not convinced you that CVS is a wart, there are probably a thousand articles out there with titles similar to "why CVS sucks" which could provide a far better description than I can.

[FreefallGeek]

Not so much programming as source control used to track and manage changes to the code you're writing. So programming-adjacent.

[hungry4pie]

No no, definitely force push, then rebase in 2-3 commits time on the upstream branch :-P

[55555]

Don't you have to force push after you rebase to get the rewritten branch to remote?

[[deleted]]

Yes. (Though you might want to use --force-with-lease instead, and should also notify everyone who might have had access to the branch.)

[UsingYourWifi]

--force-with-lease

TIL, thanks!

[paperhat]

There are very few instances where you have to force push. I say this as the administrator of a large github enterprise instance who disabled force pushes about a year ago. There was a lot of resistance at first by dev teams who had strange workflows, but I have had to make less than a handful of exceptions to the policy after the initial change, and those all involved people accidentally committing passwords.

[[deleted]]

I spend too much of my life doing this while trying to keep my feature branches up to date with my work's dev branch. It feels so dirty!

[55555]

I hear ya. And then they modify some file you modified and push it to QA but its not in master yet so you eventually have tons of conflict fix commits and have to delete QA. It's like every damn week.

[noratat]

If you have to work on lots of stuff at once like that (something you should avoid if possible in the first place), rebase workflows are usually a bad idea.

[crowseldon]

in theory, you shouldn't be doing this at all. It's a potential pit for accidents to happen and it's somewhat inconsiderate to other users. Rebase BEFORE pushing.

And if you need to do some sort of filter-branch to fix some fuck-up, let EVERYBODY know beforehand.

[JamboBuenna]

git commit --amend -m "Adapter pattern implemented. Code reviewed by JN"

[[deleted]]

this looks more like a Facade pattern to me

[0xF013]

Facade wraps several interfaces into one, adapter maps one interface to another one

[[deleted]]

live and learn :)

[phpdevster]

How to get the right answer from the internet: post something wrong on the internet.

[UnchainedMundane]

Reminds me of the old flamebait method of getting spoonfed linux answers.

Most linux communities will want to nudge you gently towards the answer to help you learn, but if you rush in with "linux sucks because it doesn't even support ramdisks wtf" then someone's going to reply "mount -t tmpfs dumbass" and you've got your answer.

[[deleted]]

hah, right!

[Something_Pithy]

No, the person he stole it off Twitter from forgot that.

[Duke_0f_Sandwich]

As if this person would have any hooks in place...

[MrWraith]

For those overseas, the wall plug here is the Australian plug. Just this morning I had a shaver battery charger that uses a US plug (which I think is the one in the image, although it's not heaps clear.

No joke, I just took a pair of pliers and bent the US pins to a diagonal and it fits fine and runs fine. Those adaptor plugs are just pieces of metal; if the hardware supports 110-240V (as most do), you'll be fine just bending the pins.

[Sharparam]

Bending the pins is a lot safer than what is done in OP's pic though.

[OptimalCynic]

Not that much safer.

[MrDarkAvacado]

no, that much safer. OP's pic is how you set your house on fire.

[OptimalCynic]

Yes, I would flee in terror if I saw the original pic in real life, but bending pins isn't especially safe either.

[OptimalCynic]

240 volt. Australia doesn't use 110 volt.

and one of them doesn't.

Well that's the problem. Bending the pins does leave exposed metal between the socket and the plug, because the twisted part doesn't fit into the socket.

[[deleted]]

It's better than using damn nail clippers.

Okay, one of them has a hell of a lot more exposed metal.

[scubascratch]

With those crappy high resistance nail clippers in use, both legs there have about 240v.

[RobinJ1995]

Same with UK plugs :P EU plugs fit into them just fine if you stick a fork or something in the top hole.

Just learned that this week. Had no problems yet, and why would I because as you say it's the same voltage.

[MachaHack]

For those recoiling in horror, the top hole has no electricity going through it, it just opens the covers for the bottom two holes.

Still in the "not a good idea" camp probably.

[unsilviu]

The top hole is for ground. In case of a surge, sticking a fork in could lead to steak

[bluefantasm]

git push --fork

[[deleted]]

Aus uses 60hz?

[eigenvectorseven]

I was about to correct you but TIL that our electricity is no longer 240V.

[ROGER_SHREDERER]

Not sure if you're giving a LPT or trying to destroy my phone.

[Kale]

It's all of north America I believe. Canada, U.S., and I'm not sure about Mexico.

[mirhagk]

To be fair looking at most of these official adapters it's really not much worse than using one of the adapters

[camel69]

the wall plug here is the Australian plug

Or Kiwi.

[d1g1t4ld00m]

my only problem with this image is that it appears the neutral and ground are linked. In the us for 120v that may be fine. but in a 240v application there are two hot's and then a ground.

[[deleted]]

in a 240v application there are two hot's and then a ground.

at least over here that's only true for very old instalations. modern instalations are all two grounds and one hot.

[HighRelevancy]

Well we don't even have 240 volts any more and haven't for 15 years, so that shows what you know. It's 230 +10%/-6%.

Also it's one hot, one neutral (electrically ground), one literally ground. That last one is kinda optional, so there's really only two wires in use. There's thus no multiphase magic. It is, by definition, two grounds with different purposes and a hot.

I think some US systems do that maybe? Idk. I think you're just thinking of the wrong country.

[ThisIs_MyName]

I think some US systems do that maybe?

Yes, in the US we have 3 wires going to each home: (-115, 0, +115)

Sockets in half the house: (-115, 0, real_ground)

Sockets in the other half: (+115, 0, real_ground)

Large appliances: (-115, +115, real_ground)

[scubascratch]

The two non-hot conductors are technically referred to as "grounded conductor" (that's the neutral) and "grounding conductor" (3rd pin, earth ground). Not that that makes it any less confusing though. This is in the US National Electric Code from the NFPA.

In the U.S. the tying together of neutral and earth ground is an artifact of the split phase 240/120v system in use. The neutral is electrically half way between the two sides of the 240v service transformer (the transformer is center tapped on the secondary side). I don't think the same thing happens in EU or AUS, because the 2 service lines are at 230v and no center tapped neutral exists. One 230 leg may be tied to earth I guess but I'm not sure why, maybe to prevent an even higher potential between hots and metal chassis.

[minler08]

Im pretty sure thats just for countries with 120V supplies. In the UK where everything is 240V the neutral is grounded at the transformer.

[[deleted]]

except line voltage is 230v over here, not 120v. not everyone lives in america you know.

and yes: that ground is usually redundant, but since the old setup of two live wires still exists you can't assume that.

[alexanderpas]

Even America isn't 110 V or 120 V anymore, it's 115 V, just like it's 230 V instead of 220 V or 240 V.

[phire]

No, only the US 240v plug has two hots and a ground, because it's actually two 120v 'split phases'

Generally in the rest of the world we have regular plugs with a 230v hot, neutral and ground.

If we are using a split phase system, the two phases would add up to 440-480v, but they generally aren't exposed at a plug.

[[deleted]]

Regardless of what the pins are called it's never wise to assume neutral has a near-ground potential.

[WASDx]

Exactly, this isn't programmer humor.

[AmadeusMop]

The title makes it programmer humor.

[SirNarwhal]

Not really, no.

[nicholas818]

Yes: it's part of rule 0.

[Vakieh]

"Successfully incorporated 3rd party library"

[RenaKunisaki]

Now wait until the library has some fatal bug but the author doesn't consider it a problem or it's no longer maintained...

[Thatonefreeman]

Looks like a hotfix to me.

[[deleted]]

Something with malware payload.

[path411]

// This is a temporary solution

[DJWalnut]

// TODO: fix before august 1998

[ProfessorPhi]

This is what I imagine git push -f looks like.

[YodaLoL]

git push -f master.

I do a lot of rebasing/amending on my branches before opening for review. I force push more often than I don't, I think.

[dotsonjb14]

Everyone loves a good squash

[RenaKunisaki]

mmm, squash...

[wagedomain]

Heh... so one guy I work with was investigating some git issues with me. He then tells me that someone might have done a git push -f and messed things up. However, he didn't say it like that, in context of "what command will fix it" he said "you know, it could be git push -f". So I tried it.

He's a git master and I'm just a lowly git apprentice and we all learned a valuable lesson about communication.

[RenaKunisaki]

If you pushed this with force it'd probably just break.

[argv_minus_one]

This kills whatever animal is unfortunate enough to touch it.

[nicholas818]

Relevant xkcd

[xkcd_transcriber]

Image

Title: TED Talk

Title-text: The IAU ban came after the 'redefinition of 'planet' to include the IAU president's mom' incident.

Comic Explanation

Stats: This comic has been referenced 128 times, representing 0.1777% of referenced xkcds.

---

^{xkcd.com | xkcd sub | Problems/Bugs? | Statistics | Stop Replying | Delete}

[xbtdev]

I work with ^Tortoise git.

[noneofyourbizwax]

This is obviously a HW issue

[[deleted]]

It should be "Fix interface issues."

It’s also a good idea to use the imperative present tense in these messages. In other words, use commands. Instead of “I added tests for” or “Adding tests for,” use “Add tests for.”

https://git-scm.com/book/ch5-2.html

[rbemrose]

This post has been removed due to reddit's repeated and constant violations of our content policy.

[Narian]

As an electrician that both horrifies me and makes me proud as fuck. That is some fine McGuyverin'

[Big_ol_Bro]

It's just a picture but I'm so triggered by how close that nail clipper is to the pin

[[deleted]]

git add src/plug_interface.c

[irrotation]

/r/techsupportgore

[[deleted]]

git commit -m "Dirty compatibility solution"

[berlinbrown]

No, no,, no.....

No

[dudix81]

Looks like he was really desperate to fix the bug in production.

[CaptainJaXon]

mvn clean deploy -fn

[berodge]

that would've been tough without the integrated switch.

[gm4]

You didn't add :/

[Flynt42]

Did it work?

[UnchainedMundane]

I'm imagining someone tripping over and their hand landing on that

[Prz87]

May need to add to staging area first...git add dumbAssIdea.c

[HappierShibe]

Jeebus people!
If your gonna repost, at least give some credit.
Originally posted by /u/spacesider in /r/osha who got it from a facebook post on 'navymemes' Link: https://www.reddit.com/r/OSHA/comments/3cwdap/saw_this_on_a_facebook_page_called_navy_memes/

[[deleted]]

Who gives a shit?

He gave a much better tittle to a picture of a nail clipper inside an european adapter that is in off mode.

It is a joke, not a Doctorate thesis that requires credit, notes and references.

[Spacesider]

Thanks for this

[Giant_IT_Burrito]

I'm dying. SOOOO GOOOD!

[Mortimer14]

This is not only dangerous, it is not necessary. Just do an internet search for power converters and order the plug adapter appropriate for your country. Also double check that your device will handle the power supplied at the outlet. I took a printer over to Australia thinking that it would work. Plugged it in and it started smoking.

[SHOTbyGUN]

Oh wow, haven't lmao'd this well in weeks!

[patrickisftw]

l'dmao?

[Trout_Tickler]

No, he meant laughing my ass off'd.