如何在不丢失提交的情况下将 GIT 合并到一个分支中？

Question

我让git push origin master并获得“一切都是最新的”。

git status ：HEAD 与 ce8de08 分离，没有可提交的内容，工作目录干净

* 0bbe78c 2020-06-12 | some changes (HEAD) [KitaXvost]
* f46d2a6 2020-06-12 | Add errors file [KitaXvost]
* 0221454 2020-06-12 | added styles for displaying messages [KitaXvost]
* de677b1 2020-06-12 | more JQuery used [KitaXvost]
* 39907fd 2020-06-12 | unification of logic forms [KitaXvost]
* f246fb6 2020-06-10 | start new version [KitaXvost]
| *   ce8de08 2020-06-08 | Merge branch 'master' of github.com:KitaXvost/bars (origin/master, master) [root]
| |\  
|/ /  
| * 7bc0239 2020-06-08 | Update config.php [KitaXvost]
* | 18b2712 2020-06-08 | add hidens 2 buttons in refresh function [KitaXvost]
* | 691a03f 2020-06-08 | fixed an error on getting id string in edit.php [KitaXvost]
* | e8c4bec 2020-06-08 | add function refresh in script.js [KitaXvost]
* | 2c5945e 2020-06-08 | delete connect DB and remove render table in index.php [KitaXvost]
* | 962ff92 2020-06-08 | add file refresh.php [KitaXvost]
|/  
* a9b2ad7 2020-06-07 | Add function close for all forms after click submit (shared/master) [KitaXvost]
* 3555a75 2020-06-07 | Create dump DB [KitaXvost]
* 6683779 2020-06-07 | Add delete.php with delete function to delete-form [KitaXvost]

Answer 1

通常：您在要推送的修订版上设置一个分支，然后推送它。 It can be a new branch ( git checkout -b new-branch; git push origin new-branch )... or an existing branch (merging: git checkout master; git merge -m "Merging" 0bbe78c; git push origin master ,假设它是您想要合并到 master 中的版本）......还有更多选择，具体取决于您想要做什么，从问题中不清楚您想要实现什么。

Answer 2

Git 始终需要提交才能将更改保存在本地分支。 稍后您可以合并远程分支。