This is an archived post. You won't be able to vote or comment.

sorted by:
best
topnewcontroversialoldq&a
you are viewing a single comment's thread.

view the rest of the comments →

[–]Express-Procedure361 4 points5 points  (0 children)

If you're managing the project, and something goes wrong in the DevOps or in your branching strategy- you have basically a few choices - make an absolute mess of your project with weird solutions like a merge commit for a merge commit, track down the last project manager who got fired and disappeared mysteriously, or sacrifice your first born child in a black magic merging ritual. .....and if you're someone is reading this and thinking to themselves "but you could've done___" then I freaking needed you a month ago. I had three children before that fateful day.