Git-代码冲突合并‘need merge’

方法一

• 【git restore 和 git restore --staged】https://blog.csdn.net/u013493841/article/details/104451987

方法二

• 【need merge】https://deepinout.com/git/git-questions/343_git_cannot_push_to_github_keeps_saying_need_merge.html