diff --git a/2019/2019-09-09_testCourseAdv/slides/amendPresentation3.md b/2019/2019-09-09_testCourseAdv/slides/amendPresentation3.md index 29bca45c84120cda8f48c6fc9fc30c879881deb8..bae91bc9b90b972b3eb7ea9cd6518da06e9c6cf1 100644 --- a/2019/2019-09-09_testCourseAdv/slides/amendPresentation3.md +++ b/2019/2019-09-09_testCourseAdv/slides/amendPresentation3.md @@ -16,3 +16,4 @@ $ git commit --amend -no-edit ``` * This will create and commit a new commit with the staged changes added. +* Force push your changes to develop diff --git a/2019/2019-09-09_testCourseAdv/slides/chPickPresentation2.md b/2019/2019-09-09_testCourseAdv/slides/chPickPresentation2.md index ae0fbaa5539ae44888d6925e84424f5b50ca8cb4..910ac9ee75c8cce96ddfe71891f52d5f957af2a5 100644 --- a/2019/2019-09-09_testCourseAdv/slides/chPickPresentation2.md +++ b/2019/2019-09-09_testCourseAdv/slides/chPickPresentation2.md @@ -7,3 +7,10 @@ $ git checkout myBranch $ git cherry-pick <commit reference> ``` * Check the log again and see if the changes were applied correctly + +* push the changes to the develop branch +```bash +$ git push origin myBranch -f +``` + +* The `-f` flag is used to force push into develop \ No newline at end of file diff --git a/2019/2019-09-09_testCourseAdv/slides/resetPresentation.md b/2019/2019-09-09_testCourseAdv/slides/resetPresentation.md index e5f68f5899dc274a0ea1630d6e5362f9afc2dea1..0a358b62dae88fc7509c78d2956538eb4babb545 100644 --- a/2019/2019-09-09_testCourseAdv/slides/resetPresentation.md +++ b/2019/2019-09-09_testCourseAdv/slides/resetPresentation.md @@ -19,4 +19,5 @@ $ git log ```bash $ git reset --hard <sha1> ``` -* Check what happened in the log \ No newline at end of file +* Check what happened in the log +* Force push your now solitary commit to develop \ No newline at end of file