Question

我将一个分支合并到当前并获得了大量“两个已修改的”消息。例如：

未合并的路径：（使用“git add ...”来标记分辨率）

    both modified:   mp/src/game/client/c_baseplayer.h
    both modified:   mp/src/game/client/c_colorcorrection.cpp
    both modified:   mp/src/game/client/c_dynamiclight.cpp
    both modified:   mp/src/game/client/c_team_train_watcher.cpp
    both modified:   mp/src/game/client/c_vehicle_jeep.cpp
    both modified:   mp/src/game/client/cdll_client_int.cpp
    both modified:   mp/src/game/client/clientmode_shared.cpp
    both modified:   mp/src/game/client/episodic/c_npc_advisor.cpp
    both modified:   mp/src/game/client/episodic/c_prop_scalable.cpp
    both modified:   mp/src/game/client/fx_impact.cpp
    both modified:   mp/src/game/client/game_controls/baseviewport.cpp
    both modified:   mp/src/game/client/game_controls/classmenu.cpp
    both modified:   mp/src/game/client/game_controls/vguitextwindow.cpp

现在如果我运行git mergetool DiffMerge成功合并每个文件，手动点击确定，保存，下一步。有没有办法让它自动将所有这些文件自动充值，只显示无法自动充电的文件？就像TortoiseSvn一样。

我运行的命令：

git clone https://github.com/ValveSoftware/source-sdk-2013.git
cd source-sdk-2013/
git remote add seco https://github.com/whoozzem/SecobMod.git
git fetch seco
git merge seco/master
git mergetool

如何让git automerge没有冲突的变化？

0 个答案: