From 10cdaded2ff9c551f4724b53c78d7c59b8e18ad3 Mon Sep 17 00:00:00 2001 From: martcpp Date: Mon, 1 Jul 2024 05:58:31 +0100 Subject: [PATCH 1/7] add a md file for assignment 1 related topics --- rust-for-bitcoiners-2/QandA_for_assignment_1.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 rust-for-bitcoiners-2/QandA_for_assignment_1.md diff --git a/rust-for-bitcoiners-2/QandA_for_assignment_1.md b/rust-for-bitcoiners-2/QandA_for_assignment_1.md new file mode 100644 index 00000000..393f8cef --- /dev/null +++ b/rust-for-bitcoiners-2/QandA_for_assignment_1.md @@ -0,0 +1 @@ +## This contain all disscussions and topic realted to assignment 1 caesar_cipher From 4e5efa45e82ce2dc998e107067a7ff303c945246 Mon Sep 17 00:00:00 2001 From: martcpp Date: Mon, 1 Jul 2024 06:33:43 +0100 Subject: [PATCH 2/7] added the detial expalnation on how to updated upstream --- .../updating_upstream_manually.md | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 rust-for-bitcoiners-2/updating_upstream_manually.md diff --git a/rust-for-bitcoiners-2/updating_upstream_manually.md b/rust-for-bitcoiners-2/updating_upstream_manually.md new file mode 100644 index 00000000..a5e4611d --- /dev/null +++ b/rust-for-bitcoiners-2/updating_upstream_manually.md @@ -0,0 +1,39 @@ +# updteing you repo with upstream if there is any correction made. + +Let me try to update mine so I can explain to the others +All right, it's a bit more complicated than cloning again, it will require a rebase. I'll explain in the next message so it can eventually be pinned. + +### step1 go to your repo and add a new remote (the repo delcin is updating): +`git remote add upstream https://github.com/delcin-raj/rfb_2_2024_2.git` + +### step2 fetch from upstream: +`git pull upstream main --rebase` + +in case of conflict (happened to me), edit each conflicting file. It will have markers like these: + +`<<<<<<< HEAD +this is some content to mess with +content to append +======= +totally different content to merge later +>>>>>>> new_branch_to_merge_later` + +To select the new text, change it to something like: + +`this is some content to mess with +content to append` +There can be potentially many of these, inspect and edit every single one. + +### step 3 after fixing all conflicts, stage the conflicting files: +`git add .` + +### step4 continue rebasing: +`git rebase --continue` + +### step 5 push to your repo: +`git push origin main --force-with-lease` + +Github classroom does not update repos automatically when the template repo changes. +When someone accepts the invitation link, it will clone the template in a new repo for the student. +So, if you accepted the invitation before the change, you have to manually rebase like the above. +If you accepted after the change, it will be already right. \ No newline at end of file From 11b11a5cacb9a8ddca91f1a2dc44b2e618b51378 Mon Sep 17 00:00:00 2001 From: martcpp Date: Mon, 1 Jul 2024 06:55:42 +0100 Subject: [PATCH 3/7] added the detial expalnation on how to updated upstream --- rust-for-bitcoiners-2/updating_upstream_manually.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rust-for-bitcoiners-2/updating_upstream_manually.md b/rust-for-bitcoiners-2/updating_upstream_manually.md index a5e4611d..e329dbca 100644 --- a/rust-for-bitcoiners-2/updating_upstream_manually.md +++ b/rust-for-bitcoiners-2/updating_upstream_manually.md @@ -1,4 +1,4 @@ -# updteing you repo with upstream if there is any correction made. +# updating you repo with upstream if there is any correction made. Let me try to update mine so I can explain to the others All right, it's a bit more complicated than cloning again, it will require a rebase. I'll explain in the next message so it can eventually be pinned. @@ -11,12 +11,12 @@ All right, it's a bit more complicated than cloning again, it will require a reb in case of conflict (happened to me), edit each conflicting file. It will have markers like these: -`<<<<<<< HEAD +` <<<<<<< HEAD this is some content to mess with content to append -======= + ======= totally different content to merge later ->>>>>>> new_branch_to_merge_later` +>>>>>>> new_branch_to_merge_later ` To select the new text, change it to something like: From d6f2efdaedee0cbb53056a32b1510e028c42866d Mon Sep 17 00:00:00 2001 From: martcpp Date: Mon, 1 Jul 2024 06:56:46 +0100 Subject: [PATCH 4/7] fix typo --- rust-for-bitcoiners-2/updating_upstream_manually.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-for-bitcoiners-2/updating_upstream_manually.md b/rust-for-bitcoiners-2/updating_upstream_manually.md index e329dbca..183007a7 100644 --- a/rust-for-bitcoiners-2/updating_upstream_manually.md +++ b/rust-for-bitcoiners-2/updating_upstream_manually.md @@ -1,4 +1,4 @@ -# updating you repo with upstream if there is any correction made. +## updating you repo with upstream if there is any correction made. Let me try to update mine so I can explain to the others All right, it's a bit more complicated than cloning again, it will require a rebase. I'll explain in the next message so it can eventually be pinned. From 66ac28cb5c9cffbe4478f36b8ab49aa8766731bc Mon Sep 17 00:00:00 2001 From: martcpp Date: Mon, 1 Jul 2024 06:57:32 +0100 Subject: [PATCH 5/7] fix typo --- rust-for-bitcoiners-2/updating_upstream_manually.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-for-bitcoiners-2/updating_upstream_manually.md b/rust-for-bitcoiners-2/updating_upstream_manually.md index 183007a7..40fc1e01 100644 --- a/rust-for-bitcoiners-2/updating_upstream_manually.md +++ b/rust-for-bitcoiners-2/updating_upstream_manually.md @@ -1,4 +1,4 @@ -## updating you repo with upstream if there is any correction made. +## updating your repo with upstream if there is any correction made. Let me try to update mine so I can explain to the others All right, it's a bit more complicated than cloning again, it will require a rebase. I'll explain in the next message so it can eventually be pinned. From 88f3d14f5b5a88262dad7fc64452eed904f3db88 Mon Sep 17 00:00:00 2001 From: martcpp Date: Mon, 1 Jul 2024 07:00:36 +0100 Subject: [PATCH 6/7] fix typo --- rust-for-bitcoiners-2/updating_upstream_manually.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rust-for-bitcoiners-2/updating_upstream_manually.md b/rust-for-bitcoiners-2/updating_upstream_manually.md index 40fc1e01..b66a149d 100644 --- a/rust-for-bitcoiners-2/updating_upstream_manually.md +++ b/rust-for-bitcoiners-2/updating_upstream_manually.md @@ -14,14 +14,14 @@ in case of conflict (happened to me), edit each conflicting file. It will have m ` <<<<<<< HEAD this is some content to mess with content to append - ======= + totally different content to merge later >>>>>>> new_branch_to_merge_later ` To select the new text, change it to something like: -`this is some content to mess with -content to append` +`this is some content to mess with content to append` + There can be potentially many of these, inspect and edit every single one. ### step 3 after fixing all conflicts, stage the conflicting files: From ecf7f82e07f37b1e21a4e2469f91a07e03f1308b Mon Sep 17 00:00:00 2001 From: martcpp Date: Mon, 1 Jul 2024 07:01:27 +0100 Subject: [PATCH 7/7] fix typo --- rust-for-bitcoiners-2/updating_upstream_manually.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-for-bitcoiners-2/updating_upstream_manually.md b/rust-for-bitcoiners-2/updating_upstream_manually.md index b66a149d..3c189472 100644 --- a/rust-for-bitcoiners-2/updating_upstream_manually.md +++ b/rust-for-bitcoiners-2/updating_upstream_manually.md @@ -16,7 +16,7 @@ this is some content to mess with content to append totally different content to merge later ->>>>>>> new_branch_to_merge_later ` + new_branch_to_merge_later ` To select the new text, change it to something like: