Thank you dear mr. boss for fucking up our master branch by adding local changes to a 2 months outdated master branch (250 FUCKING COMMITS BEHIND), pull the remote and then just push without resolving any conflicts!!!1!!!

But thank you so much for sending me an email at 10pm asking me to resolve the conflicts.

It is 3 in the morning and it took 1 hour to get it clean.

Sometimes I want to break some necks...

🤗🤗🤗🤗❤❤❤❤❤❤☕☕☕☕☕☕☕☕☕☕❤❤❤❤❤❤❤❤🤗🤗🤗🤗

@QueenMorgana thaaaank you so much, really appreciated! 😋😍😄😄😄

It looks like I'm finished now after 2 hours including testing...
3:35 in the morning... thank the spaghettimonster that I don't have to work thursday & friday... fuck this shit 🙄

My advice is this: when you leave the office if you get an email never reply until you arrive back at the office the next working day.

@spacem I will think about that in the future. Mx problem is I am not able to sleep peacefully, as long as the master branch is literally fucked.

Good that it is now resolved... I will sleep well today.

I turn off work notifications when I get home.
If it's a real emergency, they'll call.

I'd be friggin' livid if this happened. I'd fill in 3 hours (minimum I'm willing to get out of bed for) at double pay overtime.

Practical solution:

Use git diff-index --check
in .git/hooks/pre-commit

There's a usage example in the sample file, which should already be on your computer, you just need to rename the file:
https://github.com/git/git/...

In general, it's really useful to learn how the git hooks work. Besides preventing committing conflicts, you can use it to prevent direct commits to master if you work with PR branches, use it to run compile/build/package manager tools after a checkout, autocorrect code style or build docs before pushing, or prevent merging branches for which the unit tests fail.

I wondered why that hook isn't on by default, until I started to work at a company where feature/fix branches are always committed and pushed with conflicts, and there are dedicated conflict resolvers... which seems like a terrible job to me.

@AlexDeLarge your description fits perfectly!
It's a great place to work and he is great with maths and algorithms and I really like all the discussions about science, engineering and stuff, but his experience in software development and the common development workflows are limited to a, I'd say, junior dev level.

We are a tiny but innovative company. I brought up Git (before we/he used Dropbox...) and also some standard approaches to development.

He is a really cool guy, huge metal fan and has a good character. That's why I don't feel too bad about him.

But as others mentioned, sometimes it's better to not always be reachable, when outside of work hours.
My problem is I really like the work we do there and even more since we dropped using WP.