なんかgit pushしたら ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'git@*********:*********/*******.git' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. って出たのでgit pullしたら Auto-merging server.php CONFLICT (content): Merge conflict in server.php Automatic merge failed; fix conflicts and then commit the result. ってなったのでコンフリクトを直してaddしてcommitしてpushしました >>150の跡にどうするのが一番良かったのか教えて下さい
