Merge branch XXX into sit(test) branch

Git merge XXX, merge the test branch, merge the test branch, merge the test branch, merge the test branch, and resolve the conflict

  1. Currently in the XXX branch, execute git checkout test to switch to the test branch

2. Then run git merge XXX to merge XXX into the current test branch

3. Conflict occurs. Conflict files appear here.

4. To resolve the conflict, click this + to save the code temporarily

If not, use git add

5. This is a delegate conflict that has been resolved (Github Desktop Tool)

6. Add conflicting files

There are some files in the middle that are not mine that came out of merge but I didn’t change it and that’s fine

Git commit -m XXX,git pull,git push