[git] rejected master -> master (non-fast-forward)