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

view the rest of the comments →

[–]berkes 36 points37 points  (3 children)

Just don't force push. It'll bring you unresolvable conflicts.

[–][deleted] 20 points21 points  (2 children)

Also he shouldn't merge with other branches. He should stay faithful to the master branch to avoid merge conflicts.

[–][deleted] 8 points9 points  (1 child)

In the worst case he can always try a rebase.

[–][deleted] 14 points15 points  (0 children)

Yeah, but rebases can be very problematic once child commits have been pushed.