Local branch --> Remote server
git add xxx
git commit -m "xxx"
git push origin xxx
Remote Server --> Local Branch
git pull origin
Error pushing to remote server, but want to withdraw
git log --oneline
git reset --hard xxx
git push --force origin main
Conflict occurred while pushing
(1) When performing git push, Git finds that the history of the local branch and the remote branch is inconsistent, so it refuses to push and recommends that you pull the remote changes first.
(2) When performing git pull, Git will try to merge changes from the remote branch to your local branch.
(3) If both the local branch and the remote branch have new commits, Git will create a merge commit to integrate the changes of both. The title of this merge commit is usually Merge branch 'branch_name' of repository_url into branch_name
(4) Press Ctrl+O to save the file, and then press Ctrl+X to exit the editor, which causes Git to generate a merge commit using the default merge message.
ps: If you want to avoid generating merge commits, you can use the --rebase option when git pull: git pull --rebase so that Git will "rebase" your local commit to the latest commit of the remote branch, instead of generating a merge commit.