x--x--x (safe)
       \
        <a,b,c> (3 private evolutions in exp branch)

x--x--x--a (a committed only in safe banch)
       \
        b,c (b and c commited in exp branch)

git add a
git commit -m        # in exp branch, gasp!
git stash save       # save the rest of the exp work in progress
git checkout master
git merge exp        # fast-forward merge

x--x--x--a (safe,exp)
          \
           [b,c] (stashed)

git branch -f exp HEAD~1  # reset branch exp to before 'a'
git checkout exp
git stash pop
git add -A
git commit -m "..."

x--x--x--a (a committed only in safe banch)
      \
        b,c (b and c commited in exp branch)

git checkout

--force --merge --conflict

git checkout safe-branch
git add -- files-with-safe-changes
git commit
git checkout -

^{git add --patch}

git stash save
git merge safe-branch
git stash pop --index

git checkout -m

some‑file some-file

-m

git stash

git stash save
git checkout stash -- files-with-save-changes
git checkout -m safe-branch
git commit
git checkout -
git stash pop --index

^{git checkout -p stash -- files git add -- files -p git stash save --keep-index git checkout stash -- files git stash --keep-index}

git checkout -f - && git stash pop

git checkout -- files-with-safe-changes

• 在“实验性”分支上创建一个新分支
• 提交所需的任何未分页文件
• 返回主服务器
• cherrypick 无论您的“实验性”提交什么,以及步骤1中刚刚创建的新分支。
• 回到“实验”分支