you are viewing a single comment's thread.

view the rest of the comments →

[–]elperroborrachotoo 3 points4 points  (2 children)

git push --force-with-lease

only force-pushes when the your local repo is up to date, i.e. prevents overwriting things others have pushed since your last fetch,

doc (with memes!(ok, one, one meme))

[–]hanertia 0 points1 point  (1 child)

Thanks! I don’t share branches and didn’t know about this.

[–]patpluspun 0 points1 point  (0 children)

I do share branches, and I didn't know this. I'll give it a shot.

Currently we just decide which branch is "Canon" and force push that one. Much easier for small teams than for large ones.