.. _git_merge_fix_conflicts:

========================
git合并冲突修复
========================

参考
======

- `Handling a Git Pull request with merge conflict <https://akshayranganath.github.io/Git-Pull-Handling-Merge-Conflict/>`_
- `Git Merge <https://www.atlassian.com/git/tutorials/using-branches/git-merge>`_ - 这是非常详细的git合并指南
- `How can I discard remote changes and mark a file as "resolved"? <https://stackoverflow.com/questions/2073841/how-can-i-discard-remote-changes-and-mark-a-file-as-resolved>`_