blocks|key|2900668|text|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2900669|所以在打开每个有冲突的文件后，修复它，然后提交修复的文件...|blockquote|2900670|2900671|2900672|问题是你不应该commit修复。如果a.txt有合并冲突，那么您的shell日志应该如下所示：|offset|length|style|CODE|2900673|$+vim+a.txt+#+fix+conflict
$+git+add+a.txt
$+#+no+commit+between+add+and+rebase!
$+git+rebase+--continue|code-block|syntax|javascript|2900674|调用git+rebase+--continue将处理提交本身。|2900675|我不知道如何在你提交之前“回到”，当你正在进行rebase的时候。git+reset+--hard+HEAD可能会做到这一点，但就个人而言，我觉得直接转到git+rebase+--abort并重新开始会更安全，而不是在中间提交。|2900676|entityMap^0|0|0|0|0|7|6|I|5|0|0|2|L|0|X|L|25|I|0^^$0|@$1|2|3|-4|4|5|6|W|7|@]|8|@]|9|$]]|$1|A|3|B|4|C|6|X|7|@]|8|@]|9|$]]|$1|D|3|-4|4|5|6|Y|7|@]|8|@]|9|$]]|$1|E|3|-4|4|5|6|Z|7|@]|8|@]|9|$]]|$1|F|3|G|4|5|6|10|7|@$H|11|I|12|J|K]|$H|13|I|14|J|K]]|8|@]|9|$]]|$1|L|3|M|4|N|6|15|7|@]|8|@]|9|$O|P]]|$1|Q|3|R|4|5|6|16|7|@$H|17|I|18|J|K]]|8|@]|9|$]]|$1|S|3|T|4|5|6|19|7|@$H|1A|I|1B|J|K]|$H|1C|I|1D|J|K]]|8|@]|9|$]]|$1|U|3|-4|4|5|6|1E|7|@]|8|@]|9|$]]]|V|$]]

<blockquote>
 So after opening each file with a conflict, fixing it then committing the fixed files...
</blockquote>

The problem is that you aren't supposed to <code>commit</code> the fixes. If <code>a.txt</code> has a merge conflict, then your shell log should look like:

<pre><code>$ vim a.txt # fix conflict
$ git add a.txt
$ # no commit between add and rebase!
$ git rebase --continue
</code></pre>

Calling <code>git rebase --continue</code> will take care of the commit itself.

I'm not sure how to "get back" to before your commit, when you're in the middle of a rebase. <code>git reset --hard HEAD</code> would probably do the trick, but personally I'd feel safer just going straight to <code>git rebase --abort</code> and starting over without committing in the middle.

blocks|key|2900694|text|我发现自己也处于同样的境地，而git+rebase+--continue也帮不上忙。不过，运行rm+-fr+.git/rebase-apply解决了这个问题|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|2900695|entityMap^0|F|L|1B|O|0^^$0|@$1|2|3|4|5|6|7|H|8|@$9|I|A|J|B|C]|$9|K|A|L|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|M|8|@]|D|@]|E|$]]]|G|$]]

I found myself in the same boat and <code>git rebase --continue</code> didn't help. Running <code>rm -fr .git/rebase-apply</code> fixed the issue though

blocks|key|2900788|text|我同意Mark+Rushakoff的观点，修复提交不应该包括提交它们。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2900789|至少还有另外一种方式，git会继续说“你必须编辑所有的合并冲突，然后使用git+add将它们标记为已解决”，即使你已经这么做了。如果您从git版本控制中删除文件，但将未版本化的文件留在工作树中，然后尝试执行rebase，则可能会发生这种情况。|2900790|我能够解决这个问题，如下所示：|2900791|通过查看将我的未版本化文件移到我的git+rebase+--abort|offset|length|style|CODE|2900792|Determine+directory|unordered-list-item|2900793|
|2900794|Redo+git+status|2900795|2900796|I+rebase+-在我的情况下是git+svn+rebase|2900797|2900798|If您想要保留未版本化的文件，将其移回您想要的位置(我将我的文件留在我的临时目录中)，终止|2900799|+rebase并将其重置为违规文件|ordered-list-item|2900800|2900801|2900802|希望这能有所帮助。|2900803|entityMap^0|0|0|0|H|I|0|0|0|5|A|0|0|H|E|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|17|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|18|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|19|8|@]|9|@]|A|$]]|$1|F|3|G|5|6|7|1A|8|@$H|1B|I|1C|J|K]]|9|@]|A|$]]|$1|L|3|M|5|N|7|1D|8|@]|9|@]|A|$]]|$1|O|3|P|5|6|7|1E|8|@]|9|@]|A|$]]|$1|Q|3|R|5|N|7|1F|8|@$H|1G|I|1H|J|K]]|9|@]|A|$]]|$1|S|3|P|5|6|7|1I|8|@]|9|@]|A|$]]|$1|T|3|U|5|N|7|1J|8|@$H|1K|I|1L|J|K]]|9|@]|A|$]]|$1|V|3|P|5|6|7|1M|8|@]|9|@]|A|$]]|$1|W|3|X|5|N|7|1N|8|@]|9|@]|A|$]]|$1|Y|3|Z|5|10|7|1O|8|@]|9|@]|A|$]]|$1|11|3|-4|5|6|7|1P|8|@]|9|@]|A|$]]|$1|12|3|-4|5|6|7|1Q|8|@]|9|@]|A|$]]|$1|13|3|14|5|6|7|1R|8|@]|9|@]|A|$]]|$1|15|3|-4|5|6|7|1S|8|@]|9|@]|A|$]]]|16|$]]

I agree with Mark Rushakoff that fixing commits should not include committing them. 

There is at least one other way that git will continue to say that "You must edit all merge conflicts and then mark them as resolved using git add" even after you have done just this. This may occur if you remove files from git version control, but leave the unversioned file sitting in your working tree and then try to perform a rebase.

I was able to fix this problem as follows:

<ol>
<li>Terminate rebase with <code>git rebase --abort</code></li>
<li>Determine offending file by looking at <code>git status</code></li>
<li>I moved my unversioned files to my <code>tmp</code> directory</li>
<li>Redo the rebase - in my case <code>git svn rebase</code></li>
<li>If you want the unversioned file hanging around, move it back where you want it (I left mine in my tmp directory)</li>
</ol>

Hope that helps.

blocks|key|2900825|text|当这发生在我身上，我设法解决它后，意识到我已经编辑(并添加到索引)在重新基址的文件，没有冲突的，我猜这可能是错误的。所以我先用了git+checkout+--+<filename-with-no-conflict>，然后用了git+rebase+--continue，它起作用了。|type|unstyled|depth|inlineStyleRanges|offset|length|style|BOLD|CODE|entityRanges|data|2900826|entityMap^0|16|5|1S|17|34|L|0^^$0|@$1|2|3|4|5|6|7|I|8|@$9|J|A|K|B|C]|$9|L|A|M|B|D]|$9|N|A|O|B|D]]|E|@]|F|$]]|$1|G|3|-4|5|6|7|P|8|@]|E|@]|F|$]]]|H|$]]

When this happened to me, I managed to solve it after realizing I had edited (and added to the index) during the rebase a file which does not have a conflict, I guessed this might be wrong.
So I used <code>git checkout -- &lt;filename-with-no-conflict&gt;</code>, and then <code>git rebase --continue</code>, and it worked.

blocks|key|1712652|text|我已经解决了合并冲突，但我仍然看到|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1712653|1712654|您有未合并的路径。|blockquote|1712655|1712656|1712657|我所要做的就是git+add+<file+that+had+conflicts>，从那时起一切都很顺利。|offset|length|style|CODE|1712658|entityMap^0|0|0|0|0|0|7|X|0^^$0|@$1|2|3|4|5|6|7|P|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|Q|8|@]|9|@]|A|$]]|$1|C|3|D|5|E|7|R|8|@]|9|@]|A|$]]|$1|F|3|-4|5|6|7|S|8|@]|9|@]|A|$]]|$1|G|3|-4|5|6|7|T|8|@]|9|@]|A|$]]|$1|H|3|I|5|6|7|U|8|@$J|V|K|W|L|M]]|9|@]|A|$]]|$1|N|3|-4|5|6|7|X|8|@]|9|@]|A|$]]]|O|$]]

I had merge conflicts that I had addressed, yet I was still seeing
<blockquote>
You have unmerged paths.
</blockquote>
All I had to do is <code>git add &lt;file that had conflicts&gt;</code> and everything was good to go from there.

I usually <code>rebase</code> when I pull in changes from my teammates, and often time I have conflicts:

<pre><code>...
CONFLICT (content): Merge conflict in app/views/search/index.html.erb
Auto-merging public/stylesheets/application.css
CONFLICT (content): Merge conflict in public/stylesheets/application.css
Failed to merge in the changes.
Patch failed at 0001 organizing

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".
</code></pre>

So after opening each file with a conflict, fixing it then committing the fixed files:

<pre><code>~/Projects/myApp[956f6e1...]% git rebase --continue
You must edit all merge conflicts and then
mark them as resolved using git add
</code></pre>

I still get the same error...

<pre><code>~/Projects/myApp[64b3779...]% git rebase --continue 
Applying: organizing
No changes - did you forget to use 'git add'?

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".
</code></pre>

I've sort-of always had this problem, but I guess never really chose to address it, I would I always just get lazy and <code>git rebase --skip</code>. 

How do I actually resolve the conflict the right way?

After fixing conflicts git still complains?

翻译质量差，导致语言生硬或混乱。

没有提供实际的解决方法或示例。

解答不清晰，无法理解或解决问题。

页面排版不美观，阅读体验差。

文章

问答

视频

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

腾讯iOA零信任安全管理系统专区

腾讯云架构师技术同盟交流圈

腾讯云数据库专区

腾讯云顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋

腾讯云代码助手

云原生构建

TAPD 敏捷项目管理

Cloud Studio

SDK中心

API中心

命令行工具

涵盖代码开发、场景应用、自动测试全流程，助你从零构建专属AI助手

一站式MCP教程库，解锁AI应用新玩法

当我从我的队友那里引入更改时，我通常会使用rebase，并且经常会有冲突：...CONFLICT (content): Merge conflict in app/views/search/index.html.erbAuto-merging public/stylesheets/application.cssCONF...

问修复冲突后，git还在抱怨吗？
EN

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问修复冲突后，git还在抱怨吗？EN