EDIT: I get into more detail about the last point, since a guy here just gave the Very Bad Advice of using the –force option.

Git push –force