▲ 933 ▼ In case of fire (lemmy.world) submitted 2 years ago by SeeMinusMinus@lemmy.world to c/programmerhumor@lemmy.ml 73 comments fedilink hide all child comments
[–] Shizu@lemmy.world 56 points 2 years ago (3 children) Merge conflict permalink fedilink source hideshow 6 child comments replies: [–] pivot_root@lemmy.world 21 points 2 years ago 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 fedilink source parent [–] pastermil@sh.itjust.works 10 points 2 years ago (1 child) Should've pulled first before starting your work. permalink fedilink source parent hideshow 2 child comments replies: [–] atyaz@reddthat.com 7 points 2 years ago (1 child) Sometimes my work takes a while and other people push in the meantime. Guess I'm dying the fire. permalink fedilink source parent hideshow 2 child comments replies: [–] pastermil@sh.itjust.works 2 points 2 years ago (1 child) Then you pull before committing. permalink fedilink source parent hideshow 2 child comments replies: [–] atyaz@reddthat.com 6 points 2 years ago (1 child) Boom, merge conflict. The only thing left to me is force push and delete everyone's changes. permalink fedilink source parent hideshow 2 child comments replies: [–] xmunk@sh.itjust.works 3 points 2 years ago Eh, it's probably fine. Those chumps don't do anything useful. permalink fedilink source parent [–] evilgiraffe666@ttrpg.network 6 points 2 years ago (1 child) On a push? What are you merging there? permalink fedilink source parent hideshow 2 child comments replies: [–] fushuan@lemm.ee 4 points 2 years ago (1 child) Ofc, you might be working directly on develop/master/shared branch, I know people that work in those environments (ew) permalink fedilink source parent hideshow 2 child comments replies: [–] evilgiraffe666@ttrpg.network 8 points 2 years ago 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 fedilink source parent
[–] pivot_root@lemmy.world 21 points 2 years ago 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 fedilink source parent
[–] pastermil@sh.itjust.works 10 points 2 years ago (1 child) Should've pulled first before starting your work. permalink fedilink source parent hideshow 2 child comments replies: [–] atyaz@reddthat.com 7 points 2 years ago (1 child) Sometimes my work takes a while and other people push in the meantime. Guess I'm dying the fire. permalink fedilink source parent hideshow 2 child comments replies: [–] pastermil@sh.itjust.works 2 points 2 years ago (1 child) Then you pull before committing. permalink fedilink source parent hideshow 2 child comments replies: [–] atyaz@reddthat.com 6 points 2 years ago (1 child) Boom, merge conflict. The only thing left to me is force push and delete everyone's changes. permalink fedilink source parent hideshow 2 child comments replies: [–] xmunk@sh.itjust.works 3 points 2 years ago Eh, it's probably fine. Those chumps don't do anything useful. permalink fedilink source parent
[–] atyaz@reddthat.com 7 points 2 years ago (1 child) Sometimes my work takes a while and other people push in the meantime. Guess I'm dying the fire. permalink fedilink source parent hideshow 2 child comments replies: [–] pastermil@sh.itjust.works 2 points 2 years ago (1 child) Then you pull before committing. permalink fedilink source parent hideshow 2 child comments replies: [–] atyaz@reddthat.com 6 points 2 years ago (1 child) Boom, merge conflict. The only thing left to me is force push and delete everyone's changes. permalink fedilink source parent hideshow 2 child comments replies: [–] xmunk@sh.itjust.works 3 points 2 years ago Eh, it's probably fine. Those chumps don't do anything useful. permalink fedilink source parent
[–] pastermil@sh.itjust.works 2 points 2 years ago (1 child) Then you pull before committing. permalink fedilink source parent hideshow 2 child comments replies: [–] atyaz@reddthat.com 6 points 2 years ago (1 child) Boom, merge conflict. The only thing left to me is force push and delete everyone's changes. permalink fedilink source parent hideshow 2 child comments replies: [–] xmunk@sh.itjust.works 3 points 2 years ago Eh, it's probably fine. Those chumps don't do anything useful. permalink fedilink source parent
[–] atyaz@reddthat.com 6 points 2 years ago (1 child) Boom, merge conflict. The only thing left to me is force push and delete everyone's changes. permalink fedilink source parent hideshow 2 child comments replies: [–] xmunk@sh.itjust.works 3 points 2 years ago Eh, it's probably fine. Those chumps don't do anything useful. permalink fedilink source parent
[–] xmunk@sh.itjust.works 3 points 2 years ago Eh, it's probably fine. Those chumps don't do anything useful. permalink fedilink source parent
[–] evilgiraffe666@ttrpg.network 6 points 2 years ago (1 child) On a push? What are you merging there? permalink fedilink source parent hideshow 2 child comments replies: [–] fushuan@lemm.ee 4 points 2 years ago (1 child) Ofc, you might be working directly on develop/master/shared branch, I know people that work in those environments (ew) permalink fedilink source parent hideshow 2 child comments replies: [–] evilgiraffe666@ttrpg.network 8 points 2 years ago 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 fedilink source parent
[–] fushuan@lemm.ee 4 points 2 years ago (1 child) Ofc, you might be working directly on develop/master/shared branch, I know people that work in those environments (ew) permalink fedilink source parent hideshow 2 child comments replies: [–] evilgiraffe666@ttrpg.network 8 points 2 years ago 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 fedilink source parent
[–] evilgiraffe666@ttrpg.network 8 points 2 years ago 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 fedilink source parent
