Synchronize with git remote and resolve conflicts, prioritize using rebase to maintain linear history. The task completion standard is that the local and remote repositories are consistent (push to remote).
Do not directly discard commit content; you must understand the modification intent based on the commit time.