同步git远程并解决冲突，优先通过 rebase 保持线性历史，任务完成的标准是本地和远程保持一致（推送到远程）。
禁止直接丢弃提交内容，必须根据提交时间理解修改意图。
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.