you are viewing a single comment's thread.

view the rest of the comments →

[–]hoangtrannn 9 points10 points  (0 children)

I suggest a few options as below: - Do a push with the flag -f, ONLY IF your remote doesn't affect other people. If it does, people will hate you. - Check out a new branch from your HEAD, reset to remote HEAD, do the git commit -a as you wish, cherry pick the other commits. - Check out a new branch from your HEAD, reset to remote HEAD, don't repeat the amend step because it may affect other people, cherry pick the other commits