github - How does git resolve remote library conflicts?

Question

It is a warehouse that is locally associated with github

Then the github repository independently modified some files

Now we need to submit the code locally to the github repository

There will be conflicts

Answer 1

As mentioned, you can first perform git pull to pull down the remote code, then merge it locally and re-commit it

Answer 2

1. First git pull update the remote code

2. Execute git status Follow the prompts to resolve conflicting files

3. Then git add -A && git commit submit the version that resolves the conflict
   Now the version will be clean