> For the complete documentation index, see [llms.txt](https://huataihuang.gitbook.io/cloud-atlas-draft/llms.txt). Markdown versions of documentation pages are available by appending `.md` to page URLs; this page is available as [Markdown](https://huataihuang.gitbook.io/cloud-atlas-draft/devops/git/git-he-bing-shi-chong-tu-fang-qi-ben-di-xiu-gai-fang-fa.md).

# git合并时冲突放弃本地修改方法