📜  如何处理合并冲突 - 无论代码示例

📅  最后修改于: 2022-03-11 14:57:12.555000             🧑  作者: Mango

代码示例2
git stash        -- > take my project to temp memory
git pull         -- > pull the project from GitHub to working directory
                        (my computer)
git stash pop    -- > take my project to my working directory,     
                    fix the conflict and merge the project.
git add .
git commit –m “comment”
git push