(資料圖)
比如從master pick某一個commit 記錄到其它分支(release)
pick的操作方法：切到分支，點擊 show log，然后在log dialog的左上角切到master，選中需要的commit記錄，再右鍵選擇cherry pick
pick的流程：switch branche ，fetch &rebase ， pick ， push
cherry pick之后無法pushpick完成之后，需要push到遠端，但是push的時候提示需要更新，嘗試過多次的fetch&rebase，依然是這個提示。這就有些不解了，到底問題出在那兒？
hint: Updates were rejected because the remote contains work that you dohint: not have locally. This is usually caused by another repository pushinghint: to the same ref. You may want to first integrate the remote changeshint: (e.g., "git pull ...") before pushing again.hint: See the "Note about fast-forwards" in "git push --help" for details.因為在push的界面，提示本地無修改，那么查看下本地文件是否有修改？
查看本地文件已修改，并且log中也有master的log。
試試rebase同樣是在show log的窗口中，通過rebase hard完全重置，再重來一次，發(fā)現(xiàn)還是not work。
再試試切換分支切換分支的log中可以看到本地是有pick過來的修改，但是無奈push的時候沒有內(nèi)容
git.exe checkout remotes/origin/release --Warning: you are leaving 1 commit behind, not connected toany of your branches:548ce392db xxx commit log messageIf you want to keep it by creating a new branch, this may be a good timeto do so with:git branch 548ce392dbHEAD is now at af32dedb76 xxx commit log messageSuccess (437 ms @ 2023/6/26 14:15:26) 切換分支時，分支要從remote中選，而不是從上面選(本地)，選完之后，再來一次fetch&rebase，就ok了。
建議勾選 overrider branch和track。
標簽：
