.Conflict merge and save editor content
.git add <>
.git commit -m""
===== “all the above work, but below when I git reset --hard<>, and git push, then rejected by GitHub”=====
. git reset --hard<>
.“save the content in the editor”
. git push
“[rejected] master → master (non-fast-forward)
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.”
COULD SOME HELP? TKS.