blocks|key|2140472|text|您的7826b2修补程序在拔出后应用时仍然会引起冲突，但您可以执行以下操作：|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|2140473|git+reset+--soft+HEAD%5E
git+stash
git+pull
git+stash+pop+#+Will+cause+a+conflict
git+commit++++#+Re-commit+7826b2|code-block|syntax|javascript|2140474|另一个工作流程也是可能的：|2140475|git+reset+--hard+HEAD%5E
git+pull
git+cherry-pick+7826b2+#+Will+cause+a+conflict|2140476|第二个工作流依赖于这样一个事实，即Git将7826b2提交保留在reflog中(您可以将它看作是回收站)，即使您用第一行重置了它引入的更改。|2140477|entityMap^0|2|6|0|0|0|0|L|6|0^^$0|@$1|2|3|4|5|6|7|S|8|@$9|T|A|U|B|C]]|D|@]|E|$]]|$1|F|3|G|5|H|7|V|8|@]|D|@]|E|$I|J]]|$1|K|3|L|5|6|7|W|8|@]|D|@]|E|$]]|$1|M|3|N|5|H|7|X|8|@]|D|@]|E|$I|J]]|$1|O|3|P|5|6|7|Y|8|@$9|Z|A|10|B|C]]|D|@]|E|$]]|$1|Q|3|-4|5|6|7|11|8|@]|D|@]|E|$]]]|R|$]]

Your <code>7826b2</code> patch will still cause a conflict when it's applied after pulling, but you can do the following:

<pre><code>git reset --soft HEAD^
git stash
git pull
git stash pop # Will cause a conflict
git commit # Re-commit 7826b2
</code></pre>

Another workflow is also possible:

<pre><code>git reset --hard HEAD^
git pull
git cherry-pick 7826b2 # Will cause a conflict
</code></pre>

The second workflow relies on the fact that Git keeps the <code>7826b2</code> commit in the reflog (you can think of it as the recycle bin) even though you reset the changes it introduced with the first line.

blocks|key|1040536|text|有一种方法，事实上，在git中，我相信有很多种方法.|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1040537|你可以这样做：|1040538|git+stash+++++#+Stash+your+changes
git+pull++++++#+Pull+the+changes
git+stash+pop+#+Pop+your+stash|code-block|syntax|javascript|1040539|1040540|git+pull+--rebase+#+Bring+in+the+changes+and+apply+yours+on+top+of+it.|1040541|1040542|git+stash+++++#+Stash+your+changes
git+checkout+<commit>+#+Pull+a+specific+commit.
git+stash+pop+#+Pop+your+stash|1040543|希望能帮上忙。|1040544|entityMap^0|0|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|S|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|T|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|U|8|@]|9|@]|A|$G|H]]|$1|I|3|C|5|6|7|V|8|@]|9|@]|A|$]]|$1|J|3|K|5|F|7|W|8|@]|9|@]|A|$G|H]]|$1|L|3|C|5|6|7|X|8|@]|9|@]|A|$]]|$1|M|3|N|5|F|7|Y|8|@]|9|@]|A|$G|H]]|$1|O|3|P|5|6|7|Z|8|@]|9|@]|A|$]]|$1|Q|3|-4|5|6|7|10|8|@]|9|@]|A|$]]]|R|$]]

There is a way, in fact in git, I'm sure there's a multitude of ways of doing it...

You could do:

<pre><code>git stash # Stash your changes
git pull # Pull the changes
git stash pop # Pop your stash
</code></pre>

You could do:

<pre><code>git pull --rebase # Bring in the changes and apply yours on top of it.
</code></pre>

You could do:

<pre><code>git stash # Stash your changes
git checkout &lt;commit&gt; # Pull a specific commit.
git stash pop # Pop your stash
</code></pre>

Hope it helps.

blocks|key|2140512|text|如果您确实在本地存储库中提交了您的更改，则可以直接进行重基：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2140513|2140514|+git提取原点|blockquote|2140515|2140516|git重基原点/母版|2140517|2140518|这将从本地主机释放本地提交，从源/主应用新提交，然后重放本地提交。|2140519|在您的情况下，这将导致冲突，git将告诉您需要编辑哪些文件来解决冲突。这样做之后，将这些文件git+add，然后在没有参数的情况下使用git+commit重新进行更改。|offset|length|style|CODE|2140520|entityMap^0|0|0|0|0|0|0|0|1A|7|1V|A|0^^$0|@$1|2|3|4|5|6|7|T|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|U|8|@]|9|@]|A|$]]|$1|C|3|D|5|E|7|V|8|@]|9|@]|A|$]]|$1|F|3|-4|5|6|7|W|8|@]|9|@]|A|$]]|$1|G|3|H|5|6|7|X|8|@]|9|@]|A|$]]|$1|I|3|-4|5|6|7|Y|8|@]|9|@]|A|$]]|$1|J|3|K|5|6|7|Z|8|@]|9|@]|A|$]]|$1|L|3|M|5|6|7|10|8|@$N|11|O|12|P|Q]|$N|13|O|14|P|Q]]|9|@]|A|$]]|$1|R|3|-4|5|6|7|15|8|@]|9|@]|A|$]]]|S|$]]

If you did commit your changes in your local repository, you could do a straight rebase:
<blockquote>
git fetch origin
git rebase origin/master
</blockquote>
This unwinds your local commits from the local master, applies new commits from origin/master, and then replays your local commits.
In your situation, this will result in a conflict and git will tell you which files need to be edited to resolve the conflict. After you do so, <code>git add</code> those files and then <code>git commit</code> with no arguments to recommit the changes.

blocks|key|2182176|text|首先，我建议备份一下您的分支：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2182177|git+branch+your_branch_backup|code-block|syntax|javascript|2182178|那么最简单的方法是：|2182179|git+reset+--soft+<commit>+#Go+back+in+time+but+without+loosing+your+changes
git+stash+++++++++++++++++#Stash+your+changes
git+pull++++++++++++++++++#Refresh+your+branch+with+origin
git+stash+pop+++++++++++++#Re-apply+your+changes+on+the+refreshed+branch+|2182180|然后你就可以像往常一样提交|2182181|entityMap^0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|O|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|P|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|Q|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|R|8|@]|9|@]|A|$E|F]]|$1|K|3|L|5|6|7|S|8|@]|9|@]|A|$]]|$1|M|3|-4|5|6|7|T|8|@]|9|@]|A|$]]]|N|$]]

First I suggest to do a backup of your branch:

<pre><code>git branch your_branch_backup
</code></pre>

Then the easiest way is:

<pre><code>git reset --soft &lt;commit&gt; #Go back in time but without loosing your changes
git stash #Stash your changes
git pull #Refresh your branch with origin
git stash pop #Re-apply your changes on the refreshed branch 
</code></pre>

Then you can commit as usual

When I do a 'git pull', I have conflict with the head commit. So I did a 'git rebase --abort'

Can I 'save' my commit to a "patch" and then do a git pull?

What I want to emulate is:

<ul>
<li>I did not commit, but I did a 'git stash' instead</li>
<li>Do a git pull to avoid any merge error</li>
</ul>

So I need somehow to 'turn back the clock'. Is that possible with git?

How can I remove my last commit in my local git repository

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

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

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

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

文章

问答

视频

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

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

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

腾讯云数据库专区

腾讯云顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋

腾讯云代码助手

云原生构建

TAPD 敏捷项目管理

Cloud Studio

SDK中心

API中心

命令行工具

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

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

当我做'git拉‘，我有冲突的头部承诺。所以我做了一个“重基--中止”我可以“保存”我的承诺到一个“补丁”，然后做一个git拉？我想模仿的是：，我没有提交，但我做了一个'git藏‘，而做了git拉，以避免任何合并错误所以我需要“让时钟倒转”。吉特有这个可能吗？

问如何删除本地git存储库中的最后一次提交
EN

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何删除本地git存储库中的最后一次提交EN