arymandias,

Me burning to death fixing pylint warnings before I can commit my code.

Theharpyeagle,

Melting because someone didn’t configure the right profile and now isort and black are fighting over imports.

Aurenkin,

In case of

Git commit

Git push origin main --force

Fire

Oszilloraptor, (edited )

Why is the wrong version always the one that is posted.

The (in my eyes) correct (and iirc original) version is:

  • Git commit
  • Git push
  • Get out*

*as someone pointed out (and I remember it as well, but thought I rembered it wrong and corrected it, shame on me in this context) the last point may be originally “git out”

zero_gravitas,

That is so much better 👍

ChaosInstructor,

i might remember it wrong…but was it not ‘git out’?

Kidplayer_666,

It is

Oszilloraptor,

Honestly I remebered it as “git out” as well, but that would be semantically incorrect and “get out” seems close enough.

uis,
@uis@lemmy.world avatar

Here git out is mentioned

jaybone,

I remember creating an alias for “git out” which worked like teamware or meecurial’s “out” (outgoing) command to show you what you would be pushing to a branch.

Shizu,
@Shizu@lemmy.world avatar

Merge conflict

evilgiraffe666,

On a push? What are you merging there?

fushuan,

Ofc, you might be working directly on develop/master/shared branch, I know people that work in those environments (ew)

evilgiraffe666,

Right, on shared branch you might need to pull first if you’re out of date (and you would be if you’re all leaving the office at the same time), and that could cause a merge conflict.

It’s like I always said, bad branching strategies are a fire safety issue.

pivot_root,

Here at Company Inc, we continue to send our thoughts and prayers to the 38 interns who perished in the office fire of ‘07. Sixteen years later, we still mourn the loss caused by this unpredictable, unpreventable, and unlitigatable accident. We hope that, in time, the grieving families of those interns are eventually able to move on with both their hearts and their loved ones’ funeral expense debts.

pastermil,

Should’ve pulled first before starting your work.

atyaz,

Sometimes my work takes a while and other people push in the meantime. Guess I’m dying the fire.

pastermil,

Then you pull before committing.

atyaz,

Boom, merge conflict. The only thing left to me is force push and delete everyone’s changes.

xmunk,

Eh, it’s probably fine. Those chumps don’t do anything useful.

netchami,

Commit message: It’s lit🔥🔥🔥

fushuan,

Slight correction. In case of fire:

Git checkout -b firemyusername Git commit -am=“fire” Git push.

We don’t want to have conflicts with code versions when going in on a rush, better to create a new branch. We can merge all the conflicts afterwards.

flashgnash,

Isn’t that what git stash is for though?

crmsnbleyd,
@crmsnbleyd@sopuli.xyz avatar

Can’t push a stash

flashgnash,

Can’t you? Could’ve sworn you could

I’ve done it with TFS source control at least, thought it would be possible with git

PoolloverNathan,

git push origin refs/stash@{$n}:stash/$USER/$n iirc

marx2k,

Gonna need some semicolons or double ampersand in there

fushuan,

Nah, what I need is doble new lines of code blocks since this is markdown and it fucked the display.

malijaffri,

Here you go:


<span style="color:#323232;">git checkout -b firemyusername
</span><span style="color:#323232;">git commit -am="fire"
</span><span style="color:#323232;">git push
</span>
fushuan,

I know how to do it, I was just lazy lmao.

reboot6675,

Oh man I hadn’t seen a git checkout -b in years haha since they introduced switch and restore, never looked back

fushuan,

I’ll admit I just press the buttons in my favourite IDE and had to look up the commands to remind myself, but yeah.

nao,

no changes added to commit (use “git add” and/or “git commit -a”)

rufus, (edited )

It should (at least) be:


<span style="color:#323232;">git commit -a -m "🚨🔥🚨"
</span><span style="color:#323232;">git push --force
</span>

Better, create a new branch and push it to origin(?).

Relevant The IT Crowd

IAm_A_Complete_Idiot,

Better have not created any new files tho - git commit -a doesn’t catch those without an add first.

ZephyrXero,

So we need git add . && git commit -a here really

IAm_A_Complete_Idiot,

In which case the -a isn’t needed.

PrettyFlyForAFatGuy,

i read a reddit post years ago where a someone wrote a script that iterates through all the projects in their dev folder, for each project creating a new branch, committing and pushing.

they then aliased it to “fire” or “panic” or something like that.

not a bad idea really

flashgnash,

As in one they’d manually run if there was a fire?

icedterminal,

Exactly. The alias just points to the script which is executed.

flashgnash,

Ohh I see so you just run git fire?

PrettyFlyForAFatGuy,

if its aliased you should be able to just run “fire” and it does the rest

flashgnash,

Oh bash alias right

18107,

git-fire

kd45,

Cause of death: 15 minute long pre-push hook

redeven,
@redeven@lemmy.world avatar

Just

git add . &amp;&amp; git commit -m “sorry theres a fire” &amp;&amp; git push -u origin feature/fire

And run out. It will eventually finish pushing. Or not.

PoolloverNathan,

git add .; git commit -nm fire --no-gpgsign; git push -n origin fire/${USER}

Piemanding,

Mark this shit NSFW. I could have viewed it at work.

dirtySourdough,

I’ve got something similar on my office door that reads

In case of fire<br> git commit -a<br> git push<br> git -tf out

hakunawazo,

If the flames are nearby I would be so reckless and execute git push --force.
I don’t want to die for a merge conflict.
But maybe then the team will burn me later.

spongeborgcubepants,

Just push to a new branch

MoonRaven,
@MoonRaven@feddit.nl avatar

*git out

dirtbiker509,

*git -tf out

CaptainBlagbird,
@CaptainBlagbird@lemmy.world avatar

git fire

lukas,
@lukas@lemmy.haigner.me avatar

What about git add?

osmn,

“I followed the rules, Boss. Not my fault the rules are stupid 🤷‍♂️”

applebusch,

You could change it to git commit . to add and commit everything. But just in case you weren’t up to date, you should probably do


<span style="color:#323232;">git commit .
</span><span style="color:#323232;">
</span><span style="color:#323232;">git pull -s ours
</span><span style="color:#323232;">
</span><span style="color:#323232;">git push
</span>

For maximum chaos.

  • All
  • Subscribed
  • Moderated
  • Favorites
  • •
  • random
  • uselessserver093
  • Food
  • aaaaaaacccccccce
  • [email protected]
  • test
  • CafeMeta
  • testmag
  • MUD
  • RhythmGameZone
  • RSS
  • dabs
  • Socialism
  • KbinCafe
  • TheResearchGuardian
  • oklahoma
  • feritale
  • SuperSentai
  • KamenRider
  • All magazines
    •