AZZERO
V2EX  ›  问与答

git revert <version> 失败 总提示 conflicts 是什么原因呢

  •  
  •   AZZERO · Dec 31, 2017 · 2604 views
    This topic created in 3063 days ago, the information mentioned may be changed or developed.

    我在用 git revert <version>命令撤销某次操作的时候,譬如(a)--(b)--(c)--(a') (用 revert 回退到 a 提交新的 a')终端提示说有 conflicts,我解决后重新 commit 不成功,重新用 git revert <version>命令说是有文件没有 merge,我该怎么才能 revert 成功?求助……

    执行的命令如下:

    [root@yun testproject]# git revert dbe71a34db7b7f361e76a6174d472ff37c82868d

    Automatic revert failed. After resolving the conflicts,

    mark the corrected paths with 'git add <paths>' or 'git rm <paths>'

    提示 revert 失败

    No Comments Yet
    About   ·   Help   ·   Advertise   ·   Blog   ·   API   ·   FAQ   ·   Solana   ·   5279 Online   Highest 6679   ·     Select Language
    创意工作者们的社区
    World is powered by solitude
    VERSION: 3.9.8.5 · 36ms · UTC 08:38 · PVG 16:38 · LAX 01:38 · JFK 04:38
    ♥ Do have faith in what you're doing.