pastermil comments on In case of fire

[–] pastermil@sh.itjust.works 10 points 2 years ago (1 child)

Should've pulled first before starting your work.

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.

parent

[–] pastermil@sh.itjust.works 2 points 2 years ago (1 child)

Then you pull before committing.

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.

parent

[–] xmunk@sh.itjust.works 3 points 2 years ago

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

parent

lemmy:	0.19.20
mlmym (mschae):	26.3.4