From 73614c0febb2db8be971eb9009afafac7d04bd23 Mon Sep 17 00:00:00 2001 From: Daniel Duarte Tojal <daniel.duarte.001@student.uni.lu> Date: Mon, 9 Sep 2019 11:01:10 +0200 Subject: [PATCH] add line to make force push --- 2019/2019-09-09_testCourseAdv/slides/amendPresentation3.md | 1 + .../2019-09-09_testCourseAdv/slides/chPickPresentation2.md | 7 +++++++ 2019/2019-09-09_testCourseAdv/slides/resetPresentation.md | 3 ++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/2019/2019-09-09_testCourseAdv/slides/amendPresentation3.md b/2019/2019-09-09_testCourseAdv/slides/amendPresentation3.md index 29bca45c..bae91bc9 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 ae0fbaa5..910ac9ee 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 e5f68f58..0a358b62 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 -- GitLab