我开始了一个工作流程,我的目标是在一个development
分支中完成所有新功能,并且该master
分支仅用于生产就绪代码。
执行以下操作后:
git checkout master
git merge staging
我收到了一堆看起来像这样的冲突:
CONFLICT (rename/add): Rename app/assets/stylesheets/mobile.css->app/assets/stylesheets/application.css in HEAD. app/...
CONFLICT (modify/delete): app/views/organizers/mobile.html.erb deleted in HEAD and modified in staging. Version stagi...
CONFLICT (modify/delete): app/views/events/mobile.html.erb deleted in HEAD and modified in staging. Version staging of app/v...
当我现在一直在谷歌上搜索时,我所读到的只是审查每个文件,解决冲突并提交更改。但我认为做这一切没有任何意义,因为我知道代码,它只是同一代码集的进步。
如何以简单的方式合并所做的更改,staging
而master
无需查看和解决每个更改?