blocks|key|1843001|text|任何提交本质上都是“工作目录的临时副本”。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1843002|例如，您所指的“更改”实际上是在git+show+<commit>时从快照中为您生成的。|offset|length|style|CODE|1843003|所以很难直接回答你的问题。让我们试试这两种可能的途径：|1843004|分支b的历史重写的|BOLD|1843005|如果您希望在此时在分支b上提交反映分支a上的确切状态，那么为什么不直接将分支b指向它应该在的位置。就像这样：|1843006|#+get+the+uncommited+changes+on+the+branch
git+commit+-am+"Useful+message"

#+point+b+where+a+is+now
git+branch+-f+b+a

#+instead+of+forcing+the+branch+we+could+merge+with+a+strategy+ours
#+but+it's+hard+to+tell+what+you+need+from+your+description+alone

#+reset+a+to+its+previous+state
git+reset+--hard+HEAD%5E|code-block|syntax|javascript|1843007|初始状态：|1843008|C1---C2+<<<+a+<<<+HEAD+#+with+a+dirty+tree,+uncommited+changes

++++++?+<<<+b+#+(you+didn't+mention+where+b+was+pointing)|1843009|事后结果|1843010|C1---C2+<<<+a+<<<+HEAD
+++++\
++++++C3+<<<+b+#+where+your+last+(previously+uncommited)+changes+are|1843011|当它重写分支的历史时，应该仔细考虑它，并可能排除是否共享该分支。尽管如此，它还是满足了您的要求：“克隆分支b的人拥有与我现在相同的工作目录”。|1843012|不重写分支b历史的|1843013|为了避免重写分支b的历史，另一种方法是将a合并为b，并使用一种策略，该策略将从a端获取所有内容，而不仅仅是冲突的部分。会是这样的：|1843014|#+we+work+on+a+copy+of+branch+a
git+checkout+-b+a-copy+a

#+get+the+uncommited+changes+on+the+branch
git+commit+-am+"Useful+message"

#+proceed+with+the+merge,+taking+nothing+from+b
git+merge+-s+ours+b

#+we+now+reflect+the+merge+on+b,+and+this+is+a+fast-forward
git+checkout+b
git+merge+a-copy

#+no+further+need+for+the+working+copy+of+a
git+branch+-D+a-copy|1843015|a不需要被重置，因为它在任何时候都没有移动。|1843016|在第一次提交之后：|1843017|C1---C2+<<<+a
+++++\
++++++C3+<<<+a-copy+<<<+HEAD

++++++o+<<<+b+(anywhere+in+the+tree)|1843018|在第一次合并之后：|1843019|C1---C2+<<<+a
+++++\
++++++C3+(same+state+as+a,+plus+the+previously+uncommited+changes)
+++++++\
++++++++C4+<<<+a-copy+<<<+HEAD+(the+merge+taking+only+C3+side)
+++++++/
++++++o+<<<+b+(anywhere+in+the+tree)|1843020|结束状态：|1843021|C1---C2+<<<+a
+++++\
++++++C3+(same+state+as+a,+plus+the+previously+uncommited+changes)
+++++++\
++++++++C4+<<<+b+<<<+HEAD
+++++++/
++++++o|1843022|entityMap^0|0|G|H|0|0|2|1|2|1|0|0|1I|B|1|J|1|0|0|0|5|0|0|0|4|0|0|0|1Z|0|0|9|5|1|0|0|1T|8|1|13|1|0|0|0|M|0|1|0|0|9|0|0|0|9|0|0|0|5|0|0^^$0|@$1|2|3|4|5|6|7|1P|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|1Q|8|@$D|1R|E|1S|F|G]]|9|@]|A|$]]|$1|H|3|I|5|6|7|1T|8|@]|9|@]|A|$]]|$1|J|3|K|5|6|7|1U|8|@$D|1V|E|1W|F|L]|$D|1X|E|1Y|F|G]]|9|@]|A|$]]|$1|M|3|N|5|6|7|1Z|8|@$D|20|E|21|F|L]|$D|22|E|23|F|G]|$D|24|E|25|F|G]]|9|@]|A|$]]|$1|O|3|P|5|Q|7|26|8|@]|9|@]|A|$R|S]]|$1|T|3|U|5|6|7|27|8|@$D|28|E|29|F|L]]|9|@]|A|$]]|$1|V|3|W|5|Q|7|2A|8|@]|9|@]|A|$R|S]]|$1|X|3|Y|5|6|7|2B|8|@$D|2C|E|2D|F|L]]|9|@]|A|$]]|$1|Z|3|10|5|Q|7|2E|8|@]|9|@]|A|$R|S]]|$1|11|3|12|5|6|7|2F|8|@$D|2G|E|2H|F|L]]|9|@]|A|$]]|$1|13|3|14|5|6|7|2I|8|@$D|2J|E|2K|F|L]|$D|2L|E|2M|F|G]]|9|@]|A|$]]|$1|15|3|16|5|6|7|2N|8|@$D|2O|E|2P|F|L]|$D|2Q|E|2R|F|G]|$D|2S|E|2T|F|G]]|9|@]|A|$]]|$1|17|3|18|5|Q|7|2U|8|@]|9|@]|A|$R|S]]|$1|19|3|1A|5|6|7|2V|8|@$D|2W|E|2X|F|L]|$D|2Y|E|2Z|F|G]]|9|@]|A|$]]|$1|1B|3|1C|5|6|7|30|8|@$D|31|E|32|F|L]]|9|@]|A|$]]|$1|1D|3|1E|5|Q|7|33|8|@]|9|@]|A|$R|S]]|$1|1F|3|1G|5|6|7|34|8|@$D|35|E|36|F|L]]|9|@]|A|$]]|$1|1H|3|1I|5|Q|7|37|8|@]|9|@]|A|$R|S]]|$1|1J|3|1K|5|6|7|38|8|@$D|39|E|3A|F|L]]|9|@]|A|$]]|$1|1L|3|1M|5|Q|7|3B|8|@]|9|@]|A|$R|S]]|$1|1N|3|-4|5|6|7|3C|8|@]|9|@]|A|$]]]|1O|$]]

Any commit essentially is "a temporary copy of the working directory".

The "changes between" you refer to are in fact produced for you from the snapshots when you <code>git show &lt;commit&gt;</code> for example.

That why it's a bit difficult to gie a straightforward answer your question. Let's try these two possible paths :

<hr>

With history rewrite of branch <code>b</code>

If you want a commit on branch <code>b</code> reflecting the exact state on branch <code>a</code> at this very moment, why not just point directly branch b where it should. Like this :

<pre><code># get the uncommited changes on the branch
git commit -am "Useful message"

# point b where a is now
git branch -f b a

# instead of forcing the branch we could merge with a strategy ours
# but it's hard to tell what you need from your description alone

# reset a to its previous state
git reset --hard HEAD^
</code></pre>

Initial state :

<pre><code>C1---C2 &lt;&lt;&lt; a &lt;&lt;&lt; HEAD # with a dirty tree, uncommited changes

 ? &lt;&lt;&lt; b # (you didn't mention where b was pointing)
</code></pre>

Result afterwards

<pre><code>C1---C2 &lt;&lt;&lt; a &lt;&lt;&lt; HEAD
 \
 C3 &lt;&lt;&lt; b # where your last (previously uncommited) changes are
</code></pre>

As it rewrites history of the branch, it should be considered carefully, and probably ruled out if the branch is shared. Still, it does what you asked for : "someone who clones branch b has the same working directory as I have now".

<hr>

Without rewriting history of branch <code>b</code>

To avoid rewriting the history of branch <code>b</code>, an alternative is to merge a into b with a strategy which will take everything from <code>a</code> side, not only conflicting parts. It would go like this :

<pre><code># we work on a copy of branch a
git checkout -b a-copy a

# get the uncommited changes on the branch
git commit -am "Useful message"

# proceed with the merge, taking nothing from b
git merge -s ours b

# we now reflect the merge on b, and this is a fast-forward
git checkout b
git merge a-copy

# no further need for the working copy of a
git branch -D a-copy
</code></pre>

And <code>a</code> doesn't need to be reset because it didn't move at any point.

After the first commit :

<pre><code>C1---C2 &lt;&lt;&lt; a
 \
 C3 &lt;&lt;&lt; a-copy &lt;&lt;&lt; HEAD

 o &lt;&lt;&lt; b (anywhere in the tree)
</code></pre>

After the first merge :

<pre><code>C1---C2 &lt;&lt;&lt; a
 \
 C3 (same state as a, plus the previously uncommited changes)
 \
 C4 &lt;&lt;&lt; a-copy &lt;&lt;&lt; HEAD (the merge taking only C3 side)
 /
 o &lt;&lt;&lt; b (anywhere in the tree)
</code></pre>

End state :

<pre><code>C1---C2 &lt;&lt;&lt; a
 \
 C3 (same state as a, plus the previously uncommited changes)
 \
 C4 &lt;&lt;&lt; b &lt;&lt;&lt; HEAD
 /
 o
</code></pre>

blocks|key|1843059|text|重启--如果你的朋友。如果希望B之后的修订成为工作树上的方式(目前尚未提交)，则可以这样做：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1843060|git+checkout+--detach+#+disconnect+from+A
git+reset+--soft+b+#+set+the+branch+pointer+to+whatever+revision+B+is+pointing+to....+Your+working+tree+will+be+unaffected
git+add+.+#+add+everything+to+index
git+commit+-m+"revision+after+B+that+made+it+look+the+way+I+had+it+where+I+was+working"
#+if+you+like+everything,+move+b+branch+to+this+revision+and+push
git+branch+-f+b
git+checkout+b
git+push+some-remote+b|code-block|syntax|javascript|1843061|那应该行。|1843062|entityMap^0|0|0|0^^$0|@$1|2|3|4|5|6|7|K|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|L|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|M|8|@]|9|@]|A|$]]|$1|I|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|J|$]]

git reset --soft if your friend. If you want the revision after B to be the way you have on the working tree (uncommitted as of now), you can do this:

<pre><code>git checkout --detach # disconnect from A
git reset --soft b # set the branch pointer to whatever revision B is pointing to.... Your working tree will be unaffected
git add . # add everything to index
git commit -m "revision after B that made it look the way I had it where I was working"
# if you like everything, move b branch to this revision and push
git branch -f b
git checkout b
git push some-remote b
</code></pre>

That should do.

I'm on branch <code>a</code>. I want to make a commit on branch <code>b</code>, so that someone who clones branch <code>b</code> has the same working directory as I have now.

Stashing the current changes does not work because in some cases this results in a conflict.

I'm looking for the equivalent of making a temporary copy of the working directory, calling <code>git checkout -f b</code>, deleting all files, copying the temporary directory to the project directory and making a commit.

Change current branch and keep local changes

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

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

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

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

文章

问答

视频

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

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

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

腾讯云数据库专区

腾讯云顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋

腾讯云代码助手

云原生构建

TAPD 敏捷项目管理

Cloud Studio

SDK中心

API中心

命令行工具

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

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

我在a分行。我希望在分支b上提交，以便克隆分支b的人拥有与我现在相同的工作目录。保存当前更改不起作用，因为在某些情况下，这会导致冲突。我正在寻找等效于创建工作目录的临时副本、调用git checkout -f b、删除所有文件、将临时目录复制到项目目录并进行提交。

问更改当前分支并保持本地更改
EN

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问更改当前分支并保持本地更改EN