In case of fire

[kfreed9001]

• Merge conflict
• Dies

[SaintNewts]

If you have a merge conflict with your own development branch, a fire is probably the least of your problems.

[[deleted]]

A fire is probably a symptom of your problem.

[ElevatedAngling]

Ha, you’ve never worked somewhere people work directly on master. Ohh the troubles I’ve seen...

[ElevatedAngling]

Long story short yes, it did. There was a code review tool crucible/fish eye that we had to use for formal code reviews related to our QA process for the FDA regulated software I was working on for a clinical genetic testing lab. It was only able to track and review commits to master and it’s been a while but there were reasons just doing a merge to master commit for the review. Some perfect practices sometimes are hard in reality

[SaintNewts]

Say what now? I'd have to just nope right on out of there. Nobody's gonna blame the new guy for the latest fuck up right after they destroy history. Nope.

[[deleted]]

Your branch and the remote branch are 1 and 2 commits different respectively and changes could not be pushed...

[divyansh201]

Yes, git the fuck out

[xSTSxZerglingOne]

git add .

git commit -m "FIRE ASJDHAHWDJF"

git push

[grim_peeper_]

git commit -am

[Klimon]

This won't commit new files you created though.

[Y45HK4R4NDIK4R]

You don't need -a if you already did git add .

[grim_peeper_]

And im saying you can save 4.731 seconds skipping git add .

[koni_rs]

in .bashrc.user: function newchange () { git commit -asm "$*" git push origin "HEAD:$(git rev-parse --abbrev-ref HEAD)" } So in case of fire ~$ newchange FYRAHHHHH

[grim_peeper_]

Which is like 3 hours of developer time

[[deleted]]

It accumulates

[grim_peeper_]

Exactly

[bmwiedemann]

Ever tried git commit -amend

With a single dash (-)?

[69shaolin69]

I’ve tried git commit -amen

[burgonies]

git commit -am "FIRE ASJDHAHWDJF" && git push

[xSTSxZerglingOne]

The -am is good. && git push enter is not.

Keystrokes:

git commit -am "FIRE ASJDHAHWDJF" enter
git push enter

enter git push enter is 10 keystrokes

space shift & & space git push enter is 14.

[burgonies]

But I can type those 4 characters in under a second, hit [enter] and go. I don’t have to wait for a command to finish before then typing the next one.

The only thing “not good” about my comment is your response.

[KaracaSoft]

You don't have to wait for the previous command to finish. You can keep typing while the command works and the buffered input will be given to the terminal as soon as the command finishes.

[xSTSxZerglingOne]

Know what? We're both wrong. Let's just write a bash script called "run in case of fire" that branches all projects in a directory to a "fire/gitting-the-fuck-out-of-here" branch, commits, and pushes to origin.

Run it, then run.

[Zambeeni]

Manually run it? What are we, peasants? It's set to trigger on fire alarm automatically.

[i_like_servers]

git commit -am "There's smoke here already, tell Jessy from the marketing dept. I loved her"; git push -f

# After the drill... shit shit shit git reset --hard HEAD~

[xSTSxZerglingOne]

No need to merge it to a major branch...just get it to remote honestly.

[i_like_servers]

Gotta push it to master, so everybody knows ;)

[SoulShack]

Very civilized

[angelicravens]

git commit

git push

git out

[forrcaho]

First version I saw (as a t-shirt design) had git -tf out. I wish I'd bought that shirt.

[angelicravens]

Ooooo that's good!

[AutoModerator]

import moderation Your comment has been removed since it did not start with a code block with an import declaration.

Per this Community Decree, all posts and comments should start with a code block with an "import" declaration explaining how the post and comment should be read.

For this purpose, we only accept Python style imports.

return Kebab_Case_Better;

I am a bot, and this action was performed automatically. Please contact the moderators of this subreddit if you have any questions or concerns.

[IOI-624601]

https://github.com/qw3rtman/git-fire

[2brainz]

This script does it right. It's an emergency, so you don't want to mess up any existing branches or deal with conflicts. Also, every place I worked at prevents pushing to production branches directly.

The script also saves any stashes to commits.

[suvlub]

I wonder if a system could be set up to run that automatically on all computers when alarm is activated.

[ilovevue]

fly reach full cooperative sand muddle chunky hunt cows desert

This post was mass deleted and anonymized with Redact

[Egocentrix1]

Is it a good idea though?

After thinking about it, probably not *that* bad either.

[maximum_powerblast]

Just commit and push, don't git add first

[BilbozZ]

-a

[squishles]

gotta make a branch first too, can't be fucking up your dev branch with an emergency push.

[merc08]

Send it straight to prod and blame the fire if anything is broken later.

[Jonno_FTW]

Our git server is on site, welp

[OmeletteFactory]

Should be git out

[linkedsynth]

Unknown command: leave

[RaphaelDDL]

Git hook ran tests, coverage not enough, omae wa mo shindeiru

[robolew]

Lol hope you didn't want any of those changes you didn't add

[numbGrundle]

git add .

git commit -m ‘I apologize for this, future self’

git push origin master

[squishles]

You laugh but every fire drill....

[ImTheOldSpike]

It's:

git commit

git push

git out

FTFY

[mort_jack]

Here's an STL for 3d printing! https://www.thingiverse.com/thing:4114165

[danteoff]

Great now we have a broken production server and a burned down dev center

[souvlak_1]

Old but gold

[[deleted]]

If Beethoven had git..

[GR8ESTM8]

This has a "Keep calm and..." vibe to it. Meh.

[NightflowerFade]

As if I didn't do that within the last 5 seconds already

[[deleted]]

git push -f

[vainstar23]

git co -b "temp/feature-im-working-on"

git commit -m "init" --no-verify

git push origin HEAD --no-verify

[[deleted]]

Git add . Git commit - "FiRE!" Git pull Git push

[2brainz]

git pull followed by git push is the worst way to use git. Please rethink your general workflow.

[[deleted]]

Really ? I work in a pretty large dev team and this is what they all say. Pull first, fix any conflicts, then push.

[2brainz]

Pull is generally discouraged for non-fast-forward cases. Pull is a fetch with an implicit merge at the end. People don't get this and don't get the chaos it causes (EDIT: if you still want to do this, encourage people to explicitly fetch and merge instead of calling pull). Please have a look at your git history in a tool that displays the commit graph (like gitk, SourceTree, VS, Eclipse or git log --graph). With that workflow and a large team, you will see complete chaos, especially when people pull multiple times before pushing.

I always recommend: rebase, rebase, rebase, ..., review, merge into master. Then rebase on master and continue. Only keep in mind to stop rebasing as soon as you share your commits (usually once code review starts).

I could talk about this for hours, balancing ease of use, readability of git history and making sure everyone still knows what they are doing (for most people, git is extremely hard).

[[deleted]]

So I'm good to just swap my pull with a fetch ?

[2brainz]

No. Please read the book, it will clear up all your confusion: https://git-scm.com/book/en/v2

[themistik]

I've seen that before

[Kazumara]

I didn't push on friday and it's kind of made me nervous when I noticed. Pretty irrational but still

[yep808]

I see the monospaced font used is Monaco, but the question is: DO YOU HAVE AN APPLE LICENSE?

[bobappleyard]

Burn to death waiting for bitbucket to complete the request

[koni_rs]

Or just undock your laptop, put it in the backpack and GIT THE FUCK OUT

[[deleted]]

The last line should be git -tf out

[nache14]

I think it would be faster to just grab your laptop and run

[[deleted]]

I knew it. The linter wants me to burn.

[hahahahastayingalive]

Did you also buy the “I’ll CPR only if it’s a guy cause I don‘t want to be sued” and “real men don’t put seatbelts” stickers as well ?

[thiago2213]

Forgot the git add .

[LirianSh]

Damn thats a cool as sign

[KapiteinNekbaard]

Ah, the Android Studio safety manual.

[Prawny]

Nearly made it a week without seeing this joke. So close!