git
Pro Git
Atlassian Git Tutorial
Pro Git 简体中文翻译
GitX
nlimpid
V2EX  ›  git

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

  •  
  •   nlimpid · Nov 24, 2016 · 3216 views
    This topic created in 3573 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   ·   Privacy   ·   Solana   ·   2913 Online   Highest 6679   ·     Select Language
    创意工作者们的社区
    World is powered by solitude
    VERSION: 3.9.8.5 · 23ms · UTC 12:10 · PVG 20:10 · LAX 05:10 · JFK 08:10
    ♥ Do have faith in what you're doing.