V2EX = way to explore
V2EX 是一个关于分享和探索的地方
Sign Up Now
For Existing Member  Sign In
git
Pro Git
Atlassian Git Tutorial
Pro Git 简体中文翻译
GitX
nlimpid
V2EX  ›  git

git pull 和 tortosegit 执行 pull 的结果不一样,求解?

  •  
  •   nlimpid · Nov 24, 2016 · 3075 views
    This topic created in 3441 days ago, the information mentioned may be changed or developed.
    从 git 仓库 pull 代码,直接 git pull 有冲突,而用小乌龟执行就没问题。
    看 tortosegit 终端中显示如下
    git.exe pull -v --no-rebase --progress "origin"
    No Comments Yet
    About   ·   Help   ·   Advertise   ·   Blog   ·   API   ·   FAQ   ·   Solana   ·   3484 Online   Highest 6679   ·     Select Language
    创意工作者们的社区
    World is powered by solitude
    VERSION: 3.9.8.5 · 38ms · UTC 10:55 · PVG 18:55 · LAX 03:55 · JFK 06:55
    ♥ Do have faith in what you're doing.