git mergetool Normal merge conflict for '...': {local}: modifie-6ren">
gpt4 book ai didi

git - 如何跳过 "Hit return to start merge resolution tool"自动打开mergetool

转载 作者:太空狗 更新时间:2023-10-29 13:04:45 33 4
gpt4 key购买 nike

Git 要求按返回按钮逐一打开每个冲突文件的 merge 工具:

> git mergetool 
Normal merge conflict for '...':
{local}: modified file
{remote}: modified file
Hit return to start merge resolution tool (opendiff):

如何避免我的项目点击返回步骤并自动打开配置的 merge 工具?

最佳答案

要永久跳过提示,运行:

git config --global mergetool.prompt false

要跳过一次 git mergetool 运行,传递 -y--no-prompt:

git mergetool -y

关于git - 如何跳过 "Hit return to start merge resolution tool"自动打开mergetool,我们在Stack Overflow上找到一个类似的问题: https://stackoverflow.com/questions/18410889/

33 4 0
Copyright 2021 - 2024 cfsdn All Rights Reserved 蜀ICP备2022000587号
广告合作:1813099741@qq.com 6ren.com