blocks|key|395209|text|git+fetch+origin
git+reset+--hard+origin/master|type|code-block|depth|inlineStyleRanges|entityRanges|data|syntax|javascript|395210|unstyled|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|G|8|@]|9|@]|A|$B|C]]|$1|D|3|-4|5|E|7|H|8|@]|9|@]|A|$]]]|F|$]]

<pre><code>git fetch origin
git reset --hard origin/master
</code></pre>

blocks|key|759135|text|若要保留临时分支上的旧提交，请执行以下操作：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|759136|git+branch+temp|code-block|syntax|javascript|759137|然后切换到新主人|759138|git+fetch+origin
git+reset+--hard+origin/master|759139|entityMap^0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|M|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|N|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|O|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|P|8|@]|9|@]|A|$E|F]]|$1|K|3|-4|5|6|7|Q|8|@]|9|@]|A|$]]]|L|$]]

To preserve your old commits on a temporary branch in case you need them:

<pre><code>git branch temp
</code></pre>

Then switch to the new master

<pre><code>git fetch origin
git reset --hard origin/master
</code></pre>

blocks|key|792921|text|尝试这样做以消除您的本地提交：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|792922|git+reset+--hard+HEAD~4|code-block|syntax|javascript|792923|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|I|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|J|8|@]|9|@]|A|$E|F]]|$1|G|3|-4|5|6|7|K|8|@]|9|@]|A|$]]]|H|$]]

Try doing this to blow away your local commits:

<pre><code>git reset --hard HEAD~4
</code></pre>

blocks|key|792987|text|作为合并的另一种选择，您可以使用以下命令将特性分支重新定位到主分支：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|792988|git+checkout+feature
git+rebase+master|code-block|syntax|javascript|792989|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|I|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|J|8|@]|9|@]|A|$E|F]]|$1|G|3|-4|5|6|7|K|8|@]|9|@]|A|$]]]|H|$]]

As an alternative to merging, you can rebase the feature branch onto master branch using the following commands:

<pre><code>git checkout feature
git rebase master
</code></pre>

blocks|key|396504|text|如果硬重置不适合您，并且您不想进行拉-合并，则可以删除本地分支并重新下载原始分支，从而丢弃本地不必要的更改：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|396505|git+branch+-D+<local+branch>
git+checkout+-b+<branch+name>+origin/<branch+name>|code-block|syntax|javascript|396506|以main为例：|offset|length|style|CODE|396507|git+branch+-D+main
git+checkout+-b+main+origin/main|396508|entityMap^0|0|0|1|4|0|0^^$0|@$1|2|3|4|5|6|7|Q|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|R|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|S|8|@$I|T|J|U|K|L]]|9|@]|A|$]]|$1|M|3|N|5|D|7|V|8|@]|9|@]|A|$E|F]]|$1|O|3|-4|5|6|7|W|8|@]|9|@]|A|$]]]|P|$]]

If a hard reset doesn't cut it for you and you don't want to do a pull-merge you can throw away your local unwanted changes by deleting your local branch and re-download the origin one:
<pre><code>git branch -D &lt;local branch&gt;
git checkout -b &lt;branch name&gt; origin/&lt;branch name&gt;
</code></pre>
Using <code>main</code> as an example:
<pre><code>git branch -D main
git checkout -b main origin/main
</code></pre>

blocks|key|759255|text|若要擦除最新的本地提交，请使用以下命令：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|759256|git+reset+HEAD%5E|code-block|syntax|javascript|759257|这将使报头返回到提交之前的状态，并允许您从主服务器返回到git+pull。在从远程存储库提取之前，请确保将所有更改保存到其他地方(本地)。|offset|length|style|CODE|759258|要能够在没有冲突的情况下拉动，请使用git+stash，然后使用git+pull。|759259|entityMap^0|0|0|S|8|0|I|9|W|8|0^^$0|@$1|2|3|4|5|6|7|Q|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|R|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|S|8|@$I|T|J|U|K|L]]|9|@]|A|$]]|$1|M|3|N|5|6|7|V|8|@$I|W|J|X|K|L]|$I|Y|J|Z|K|L]]|9|@]|A|$]]|$1|O|3|-4|5|6|7|10|8|@]|9|@]|A|$]]]|P|$]]

To erase your latest local commit use the following: 

<pre><code>git reset HEAD^
</code></pre>

This will get the header back to the state previous to the commit, and will allow you to <code>git pull</code> from master. Make sure you save all your changes elsewhere (locally) before pulling from the remote repository. 

To be able to pull without conflicts use <code>git stash</code>, and then <code>git pull</code>.

I have the following message in git: 

<pre><code># Your branch and 'origin/master' have diverged,
# and have 3 and 8 different commits each, respectively.
# (use "git pull" to merge the remote branch into yours)
</code></pre>

I would like to throw away the 3 local commits, and pull the 8 remote commits at origin/master. 

(Merging is going to be too difficult, I'd rather make the 3 local commits again once master is up to date.)

How can I do this?

git: Your branch and 'origin/master' have diverged - how to throw away local commits?

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

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

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

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

文章

问答

视频

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

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

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

腾讯云数据库专区

腾讯云顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋 

腾讯云代码助手

CODING DevOps

Cloud Studio

SDK中心

API中心

命令行工具

我在git中有以下信息：# Your branch and 'origin/master' have diverged,# and have 3 and 8 different commits each, respectively.#   (use "git pull" to merge the remote branch into yours)我想扔掉3本地提交，并拉8远程提交在原产地/主人。(

问git:你的分支和“起源/主人”有分歧--如何丢弃本地提交？
EN

回答 6

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问git:你的分支和“起源/主人”有分歧--如何丢弃本地提交？EN

回答 6

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问git:你的分支和“起源/主人”有分歧--如何丢弃本地提交？
EN