# verify that you have the "origin" set to your fork and "upstream" set to the original. Rest of the steps depend on this :) ``` [dims@dims-a01] sig-contributor-strategy ⟩ git remote -v origin git@github.com:dims/sig-contributor-strategy.git (fetch) origin git@github.com:dims/sig-contributor-strategy.git (push) upstream git@github.com:cncf/sig-contributor-strategy.git (fetch) upstream git@github.com:cncf/sig-contributor-strategy.git (push) ``` # Make sure you are on the correct branch ``` [dims@dims-a01] sig-contributor-strategy ⟩ git branch master * recruitingddraft ``` # Switch back to master as we will perform surgery on the branch ``` [dims@dims-a01] sig-contributor-strategy ⟩ git checkout master Switched to branch 'master' Your branch is up to date with 'upstream/master'. ``` # Ensure we pick up latest master changes from upstream ``` [dims@dims-a01] sig-contributor-strategy ⟩ git pull upstream master From github.com:cncf/sig-contributor-strategy * branch master -> FETCH_HEAD Already up to date. 1 adding skeleton for recruiting playbook ``` # Delete the bad branch. Don't worry your changes are still safe, we will resurrect them later ``` [dims@dims-a01] sig-contributor-strategy ⟩ git branch -D recruitingddraft Deleted branch recruitingddraft (was 5444d7765a05). ``` # Create a fresh branch with the same exact name ``` [dims@dims-a01] sig-contributor-strategy ⟩ git checkout -b recruitingddraft Switched to a new branch 'recruitingddraft' ``` # Cherry Pick the first commit. You will see a failure as master has drifted away. ``` [dims@dims-a01] sig-contributor-strategy ⟩ git cherry-pick 316e52b27b7f034541e11f3468e6d72ac60757ad CONFLICT (add/add): Merge conflict in contributor-growth/docs/recruiting-playbook.md Auto-merging contributor-growth/docs/recruiting-playbook.md error: could not apply 316e52b27b7f... adding skeleton for recruiting playbook hint: after resolving the conflicts, mark the corrected paths hint: with 'git add <paths>' or 'git rm <paths>' hint: and commit the result with 'git commit' ``` # Assume you don't care about the changes in master. Let's just pick up whatever was in your sandbox. (Note the SHA is the same as we did in the previous step). We are basically telling git to pick up the file in the commit we had. ``` [dims@dims-a01] sig-contributor-strategy ⟩ git checkout 316e52b27b7f034541e11f3468e6d72ac60757ad contributor-growth/docs/recruiting-playbook.md Updated 1 path from c7ae750df4b6 ``` # We need to update the file in the commit ``` [dims@dims-a01] sig-contributor-strategy ⟩ git add contributor-growth/docs/recruiting-playbook.md ``` # Tell git we are ready to go to the next step so we should wrap up with this commit ``` [dims@dims-a01] sig-contributor-strategy ⟩ git cherry-pick --continue [recruitingddraft dcd357f997ca] adding skeleton for recruiting playbook Author: Paris Pittman <paris_pittman@apple.com> Date: Tue Nov 17 20:00:21 2020 -0800 1 file changed, 10 insertions(+), 15 deletions(-) ``` # Grab the next commit you made ``` [dims@dims-a01] sig-contributor-strategy ⟩ git cp 5444d7765a0520cbbae1bc7d5c7080511e5b5ed0 Removing contributor-growth/docs/recruiting-playbook.md [recruitingddraft 135fc205e44f] moved to drafts with content and formatting Author: Paris Pittman <paris_pittman@apple.com> Date: Wed Mar 3 20:30:13 2021 -0800 3 files changed, 137 insertions(+), 90 deletions(-) delete mode 100644 contributor-growth/docs/recruiting-playbook.md create mode 100644 contributor-growth/drafts/recruiting-playbook.md ``` # Verify you are still in the right branch :) ``` [dims@dims-a01 07:44] sig-contributor-strategy ⟩ git branch master * recruitingddraft ``` # Verify both commits are there ``` [dims@dims-a01] sig-contributor-strategy ⟩ git log --pretty=oneline | head -2 135fc205e44fa152a1575f35f8d3a83ed128fe00 moved to drafts with content and formatting dcd357f997caa4d437d982b3723e6d4a18631cd3 adding skeleton for recruiting playbook ``` # Profit! ``` [dims@dims-a01 07:44] sig-contributor-strategy ⟩ git push -f origin recruitingddraft ```