时间戳

首页 > 解决方案 > .gitignore 的 git 合并/壁球问题

git - .gitignore 的 git 合并/壁球问题

问题描述

我有 2 个以前的提交，我想合并为一个 1，它们都是 .gitignore

第一次提交.gitignore：

  /Download/SoccerNet
  /Download/BWF TV/**/*.mp4
  /Download/Badminton Video Data (youtube-dl, unlabeled)
+ /Dataset/SoccerNet
+ /Dataset/Badminton/BWF TV/**/*.mp4
+ /Dataset/Badminton/Youtube (unlabeled)
+ /Tutorials (youtube-dl)

第二次提交.gitignore：

  # NEW
+ <<<<<<< HEAD
  /Download/SoccerNet
  /Download/BWF TV/**/*.mp4
  /Download/Badminton Video Data (youtube-dl, unlabeled)
+ =======
+ >>>>>>> cd75117 (Add .gitattributes, Edit .gitignore)
  /Dataset/SoccerNet
  /Dataset/Badminton/BWF TV/**/*.mp4
  /Dataset/Badminton/Youtube (unlabeled)

运行时git rebase -i <first-commit-SHA>，然后将 rebase 文件编辑为：

pick <first-commit-SHA> <message1>
s <second-commit-SHA> <message2>

我得到错误：

error: Your local changes to the following files would be overwritten by merge:
        .gitattributes
Please commit your changes or stash them before you merge.
Aborting
hint: Could not execute the todo command
hint:
hint:     pick ff23b6f067d253ffd8f5865ba99973d69bc1904e .gitignore, .gitattributes
hint:
hint: It has been rescheduled; To edit the command before continuing, please
hint: edit the todo list first:
hint:
hint:     git rebase --edit-todo
hint:     git rebase --continue

我不明白为什么这两个.gitignore实例不能被压缩在一起。

标签： gitmergegit-mergerebasegit-rebase

解决方案

推荐阅读