99 points

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

permalink
report
reply
17 points

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

permalink
report
parent
reply
76 points
*

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”

permalink
report
reply
29 points

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

permalink
report
parent
reply
5 points

It is

permalink
report
parent
reply
2 points

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

permalink
report
parent
reply
12 points

Here git out is mentioned

permalink
report
parent
reply
7 points

That is so much better 👍

permalink
report
parent
reply
1 point

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.

permalink
report
parent
reply
56 points

Merge conflict

permalink
report
reply
21 points

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.

permalink
report
parent
reply
10 points

Should’ve pulled first before starting your work.

permalink
report
parent
reply
7 points

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

permalink
report
parent
reply
2 points

Then you pull before committing.

permalink
report
parent
reply
6 points

On a push? What are you merging there?

permalink
report
parent
reply
4 points

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

permalink
report
parent
reply
8 points

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.

permalink
report
parent
reply
48 points
*

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

permalink
report
reply
32 points
permalink
report
parent
reply
10 points

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

permalink
report
parent
reply
7 points

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

permalink
report
parent
reply
8 points

Ohh I see so you just run git fire?

permalink
report
parent
reply
37 points

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.

permalink
report
reply
2 points

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

permalink
report
parent
reply
2 points

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

permalink
report
parent
reply
2 points

Isn’t that what git stash is for though?

permalink
report
parent
reply
4 points

Can’t push a stash

permalink
report
parent
reply
1 point

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

permalink
report
parent
reply
1 point
*

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

permalink
report
parent
reply
1 point
*

Gonna need some semicolons or double ampersand in there

permalink
report
parent
reply
2 points

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

permalink
report
parent
reply
2 points

Here you go:

git checkout -b firemyusername
git commit -am="fire"
git push
permalink
report
parent
reply

Programmer Humor

!programmerhumor@lemmy.ml

Create post

Post funny things about programming here! (Or just rant about your favourite programming language.)

Rules:

  • Posts must be relevant to programming, programmers, or computer science.
  • No NSFW content.
  • Jokes must be in good taste. No hate speech, bigotry, etc.

Community stats

  • 5.1K

    Monthly active users

  • 1.5K

    Posts

  • 33K

    Comments