From 02ed7d89245fa624795b8e0fdd2ade1868a00367 Mon Sep 17 00:00:00 2001 From: Isaac-Ofori-1 Date: Tue, 23 May 2023 15:57:09 -0400 Subject: [PATCH 01/27] Isaac_Rep --- Isaac | 1 - Isaac_Rep | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 Isaac diff --git a/Isaac b/Isaac deleted file mode 100644 index 31fb23a..0000000 --- a/Isaac +++ /dev/null @@ -1 +0,0 @@ -I love GhanaI love Ghana diff --git a/Isaac_Rep b/Isaac_Rep index f70ca91..fad2dfe 100644 --- a/Isaac_Rep +++ b/Isaac_Rep @@ -1 +1 @@ -Isaac +This is a new one From fef9bbffb5a364bc1f123a573c028aab75ebb09d Mon Sep 17 00:00:00 2001 From: Lyudmila Slipchenko Date: Tue, 23 May 2023 14:55:12 -0400 Subject: [PATCH 02/27] Update README.md --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4bc0baa..1345611 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,13 @@ Basic git commands Clone repository to a local machine -'git clone ...' +`git clone ...` + +Create your own branch +`git checkout -b new_branch` Add your changes to local repository -'git add *' +`git add *` 'git commit -m "description of my changes"' From 5bcae498d95ec01f1aee2abf3dc358a59c69bce9 Mon Sep 17 00:00:00 2001 From: Lyudmila Slipchenko Date: Tue, 23 May 2023 14:56:44 -0400 Subject: [PATCH 03/27] Update README.md --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1345611..0c2313e 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,13 @@ Clone repository to a local machine Create your own branch `git checkout -b new_branch` +Check all branches +`git branch` + Add your changes to local repository `git add *` -'git commit -m "description of my changes"' +`git commit -m "description of my changes"` -'git push origin master' +`git push origin master` From 7f3b0280ae3ce380672b4999d61350f3fb4b6224 Mon Sep 17 00:00:00 2001 From: Lyudmila Slipchenko Date: Tue, 23 May 2023 15:00:04 -0400 Subject: [PATCH 04/27] Update README.md --- README.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0c2313e..acd0024 100644 --- a/README.md +++ b/README.md @@ -11,10 +11,16 @@ Create your own branch Check all branches `git branch` -Add your changes to local repository -`git add *` +Switch to a branch "branch_name" +`git branch branch_name` +Add all your changes to local repository +`git add .` +Add specific file to local repository +`git add file_name` + +Commit changes to a branch on a local machine `git commit -m "description of my changes"` `git push origin master` From 056bebd32c265ada2c103e1bca19b4e68bb5bd83 Mon Sep 17 00:00:00 2001 From: Lyudmila Slipchenko Date: Tue, 23 May 2023 15:07:52 -0400 Subject: [PATCH 05/27] Update README.md --- README.md | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index acd0024..ac6cf8f 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,16 @@ ## repository to practice git tools +To start with git + +`` + Basic git commands Clone repository to a local machine `git clone ...` -Create your own branch -`git checkout -b new_branch` +Create your own branch "my_branch" +`git checkout -b my_branch` Check all branches `git branch` @@ -23,4 +27,9 @@ Add specific file to local repository Commit changes to a branch on a local machine `git commit -m "description of my changes"` -`git push origin master` +Push your changes in branch "branch_name" to the remote (cloud) +`git push origin branch_name` +This creates or updates "branch_name" on cloud github + +Update local master branch +`git pull origin master --rebase` From 9200c678f6e0b0e85d4e097748f277715567c31b Mon Sep 17 00:00:00 2001 From: Lyudmila Slipchenko Date: Tue, 23 May 2023 15:13:32 -0400 Subject: [PATCH 06/27] Update README.md --- README.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ac6cf8f..a9b40ab 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,13 @@ ## repository to practice git tools -To start with git +### To start with git -`` +- on windows, install git +- add ssh keys to your machine via `ssh-keygen` command +- add public ssh keys to git web (in settings, add new ssh keys) +- do `git config` -Basic git commands +### Basic git commands Clone repository to a local machine `git clone ...` @@ -31,5 +34,7 @@ Push your changes in branch "branch_name" to the remote (cloud) `git push origin branch_name` This creates or updates "branch_name" on cloud github +Merge your branch with master: on git website, submit merge request for your branch + Update local master branch `git pull origin master --rebase` From 27a7f7a2863efd83bd6fea0d6f6ddfbe46dc0f80 Mon Sep 17 00:00:00 2001 From: Satarupa Gupta Date: Tue, 23 May 2023 15:14:53 -0400 Subject: [PATCH 07/27] new text file --- new_sgupta.txt.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 new_sgupta.txt.txt diff --git a/new_sgupta.txt.txt b/new_sgupta.txt.txt new file mode 100644 index 0000000..b08fb64 --- /dev/null +++ b/new_sgupta.txt.txt @@ -0,0 +1 @@ +jmasjdskskfckdvnj \ No newline at end of file From 095e893f2e29b1b2531cd9a28069ad76bf6bbbac Mon Sep 17 00:00:00 2001 From: Jack Lawrence Date: Tue, 23 May 2023 15:12:21 -0400 Subject: [PATCH 08/27] made text file with my name in it --- new_file_jack.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 new_file_jack.txt diff --git a/new_file_jack.txt b/new_file_jack.txt new file mode 100644 index 0000000..d31dac7 --- /dev/null +++ b/new_file_jack.txt @@ -0,0 +1 @@ +Sample text added to the new file to merge into Github. \ No newline at end of file From 56228d4047b4e18f89e46091c0587e2623587982 Mon Sep 17 00:00:00 2001 From: Lyudmila Slipchenko Date: Tue, 23 May 2023 15:33:34 -0400 Subject: [PATCH 09/27] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a9b40ab..6c2f0d9 100644 --- a/README.md +++ b/README.md @@ -37,4 +37,4 @@ This creates or updates "branch_name" on cloud github Merge your branch with master: on git website, submit merge request for your branch Update local master branch -`git pull origin master --rebase` +`git pull origin main --rebase` From 66ee9b419bb9203a0bc2529adbc0103251d5eddf Mon Sep 17 00:00:00 2001 From: asurbinab92 Date: Tue, 23 May 2023 15:29:40 -0400 Subject: [PATCH 10/27] description of my changes --- andres_file.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 andres_file.txt diff --git a/andres_file.txt b/andres_file.txt new file mode 100644 index 0000000..af5a062 --- /dev/null +++ b/andres_file.txt @@ -0,0 +1 @@ +Hola \ No newline at end of file From 159c0526ec796f4244eb23b429e6f22d3dd8d34a Mon Sep 17 00:00:00 2001 From: safaahad <66687329+safaahad@users.noreply.github.com> Date: Tue, 23 May 2023 15:15:08 -0400 Subject: [PATCH 11/27] added text file 'hello.txt' --- hello.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 hello.txt diff --git a/hello.txt b/hello.txt new file mode 100644 index 0000000..288c2c9 --- /dev/null +++ b/hello.txt @@ -0,0 +1 @@ +ajdnjasnjnas,d \ No newline at end of file From 2d16be1ba47ba69773c068ee1a625bd21c5237c0 Mon Sep 17 00:00:00 2001 From: Suranjan Paul Date: Tue, 23 May 2023 15:09:57 -0400 Subject: [PATCH 12/27] skp_file made by skp --- skp_file | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 skp_file diff --git a/skp_file b/skp_file new file mode 100644 index 0000000..43702d6 --- /dev/null +++ b/skp_file @@ -0,0 +1,3 @@ + +I am trying to add and +commit and push... hth!! From b00e51942f5f0a1515351ce5dc6832499d50a641 Mon Sep 17 00:00:00 2001 From: Jack Lawrence Date: Tue, 23 May 2023 15:41:13 -0400 Subject: [PATCH 13/27] talked about Shahed in groupfile --- group_file | 3 +++ 1 file changed, 3 insertions(+) diff --git a/group_file b/group_file index a23fa92..0462354 100644 --- a/group_file +++ b/group_file @@ -1 +1,4 @@ Hello! This is the group file. Add some toughts here! + + +Shahed complains a lot \ No newline at end of file From 0bcb24e361077f8631afdd40ff42d77050f52578 Mon Sep 17 00:00:00 2001 From: Suranjan Paul Date: Tue, 23 May 2023 15:52:24 -0400 Subject: [PATCH 14/27] made 2nd change to skp_file --- skp_file | 3 +++ 1 file changed, 3 insertions(+) diff --git a/skp_file b/skp_file index 43702d6..bac0dc4 100644 --- a/skp_file +++ b/skp_file @@ -1,3 +1,6 @@ I am trying to add and commit and push... hth!! + +First time done well.. Now +doing the ugly stuff!! Lets see.. From 417e0af1963aa033cff6291bb4377c37db91434b Mon Sep 17 00:00:00 2001 From: asurbinab92 Date: Tue, 23 May 2023 16:00:09 -0400 Subject: [PATCH 15/27] description of my changes --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 6c2f0d9..bc8122e 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,10 @@ Add all your changes to local repository Add specific file to local repository `git add file_name` +Add yout ids +`git config --global user.email "your email"` +`git config --global user.name "your username"` + Commit changes to a branch on a local machine `git commit -m "description of my changes"` From 6df2a61d9127ecf9fa9a81c92f5263436ab00eda Mon Sep 17 00:00:00 2001 From: Jack Lawrence Date: Tue, 23 May 2023 15:52:58 -0400 Subject: [PATCH 16/27] ugly stuff in group_file --- group_file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/group_file b/group_file index 0462354..e32ca11 100644 --- a/group_file +++ b/group_file @@ -1,4 +1,4 @@ Hello! This is the group file. Add some toughts here! -Shahed complains a lot \ No newline at end of file +Shahed complains a lot \ No newline at end of file From a0c34914fbf99b37fed3fc5b785bed06d2e8e52d Mon Sep 17 00:00:00 2001 From: asurbinab92 Date: Tue, 6 Jun 2023 14:34:12 -0400 Subject: [PATCH 17/27] trouble with changed Isaac file --- Isaac | 1 + Isaac_Rep | 2 ++ README.md | 88 +++++++++++++++++++++++++++--------------------------- group_file | 6 ++-- skp_file | 12 ++++---- 5 files changed, 56 insertions(+), 53 deletions(-) create mode 100644 Isaac diff --git a/Isaac b/Isaac new file mode 100644 index 0000000..e35f1a4 --- /dev/null +++ b/Isaac @@ -0,0 +1 @@ +I love GhanaI love Ghana diff --git a/Isaac_Rep b/Isaac_Rep index fad2dfe..cb6265a 100644 --- a/Isaac_Rep +++ b/Isaac_Rep @@ -1 +1,3 @@ This is a new one +Isaac +Ofori diff --git a/README.md b/README.md index bc8122e..9bea57b 100644 --- a/README.md +++ b/README.md @@ -1,44 +1,44 @@ -## repository to practice git tools - -### To start with git - -- on windows, install git -- add ssh keys to your machine via `ssh-keygen` command -- add public ssh keys to git web (in settings, add new ssh keys) -- do `git config` - -### Basic git commands - -Clone repository to a local machine -`git clone ...` - -Create your own branch "my_branch" -`git checkout -b my_branch` - -Check all branches -`git branch` - -Switch to a branch "branch_name" -`git branch branch_name` - -Add all your changes to local repository -`git add .` - -Add specific file to local repository -`git add file_name` - -Add yout ids -`git config --global user.email "your email"` -`git config --global user.name "your username"` - -Commit changes to a branch on a local machine -`git commit -m "description of my changes"` - -Push your changes in branch "branch_name" to the remote (cloud) -`git push origin branch_name` -This creates or updates "branch_name" on cloud github - -Merge your branch with master: on git website, submit merge request for your branch - -Update local master branch -`git pull origin main --rebase` +## repository to practice git tools + +### To start with git + +- on windows, install git +- add ssh keys to your machine via `ssh-keygen` command +- add public ssh keys to git web (in settings, add new ssh keys) +- do `git config` + +### Basic git commands + +Clone repository to a local machine +`git clone ...` + +Create your own branch "my_branch" +`git checkout -b my_branch` + +Check all branches +`git branch` + +Switch to a branch "branch_name" +`git branch branch_name` + +Add all your changes to local repository +`git add .` + +Add specific file to local repository +`git add file_name` + +Add your ids +`git config --global user.email "your email"` +`git config --global user.name "your username"` + +Commit changes to a branch on a local machine +`git commit -m "description of my changes"` + +Push your changes in branch "branch_name" to the remote (cloud) +`git push origin branch_name` +This creates or updates "branch_name" on cloud github + +Merge your branch with master: on git website, submit merge request for your branch + +Update local master branch +`git pull origin main --rebase` diff --git a/group_file b/group_file index e32ca11..312bca1 100644 --- a/group_file +++ b/group_file @@ -1,4 +1,4 @@ -Hello! This is the group file. Add some toughts here! - - +Hello! This is the group file. Add some toughts here! + + Shahed complains a lot \ No newline at end of file diff --git a/skp_file b/skp_file index bac0dc4..667f6f1 100644 --- a/skp_file +++ b/skp_file @@ -1,6 +1,6 @@ - -I am trying to add and -commit and push... hth!! - -First time done well.. Now -doing the ugly stuff!! Lets see.. + +I am trying to add and +commit and push... hth!! + +First time done well.. Now +doing the ugly stuff!! Lets see.. From 4b32a66e3068100d6f6ff8c3fbf828a3c83778b6 Mon Sep 17 00:00:00 2001 From: Lyudmila Slipchenko Date: Tue, 6 Jun 2023 14:36:35 -0400 Subject: [PATCH 18/27] Update README.md --- README.md | 94 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 50 insertions(+), 44 deletions(-) diff --git a/README.md b/README.md index 9bea57b..ba1dd0c 100644 --- a/README.md +++ b/README.md @@ -1,44 +1,50 @@ -## repository to practice git tools - -### To start with git - -- on windows, install git -- add ssh keys to your machine via `ssh-keygen` command -- add public ssh keys to git web (in settings, add new ssh keys) -- do `git config` - -### Basic git commands - -Clone repository to a local machine -`git clone ...` - -Create your own branch "my_branch" -`git checkout -b my_branch` - -Check all branches -`git branch` - -Switch to a branch "branch_name" -`git branch branch_name` - -Add all your changes to local repository -`git add .` - -Add specific file to local repository -`git add file_name` - -Add your ids -`git config --global user.email "your email"` -`git config --global user.name "your username"` - -Commit changes to a branch on a local machine -`git commit -m "description of my changes"` - -Push your changes in branch "branch_name" to the remote (cloud) -`git push origin branch_name` -This creates or updates "branch_name" on cloud github - -Merge your branch with master: on git website, submit merge request for your branch - -Update local master branch -`git pull origin main --rebase` +## repository to practice git tools + +### To start with git + +- if you do not have WSL installed on Wondows, install git. Otherwise, WSL already has git installed. Just work from the WSL terminal +- add ssh keys to your machine via `ssh-keygen` command +- add public ssh keys to git web (in settings, add new ssh keys) +- do `git config` + +### Basic git commands + +Clone repository to a local machine +`git clone ...` + +Create your own branch "my_branch" +`git checkout -b my_branch` + +Check all branches +`git branch` + +Switch to a branch "branch_name" +`git branch branch_name` + +Add all your changes to local repository +`git add .` + +Add specific file to local repository +`git add file_name` + +Commit changes to a branch on a local machine +`git commit -m "description of my changes"` + +Push your changes in branch "branch_name" to the remote (cloud) +`git push origin branch_name` +This creates or updates "branch_name" on cloud github + +Merge your branch with master: on git website, submit merge request for your branch + +Update local master branch +`git pull origin main --rebase` + +**Explanation of the `-- rebase` option from [https://www.gitkraken.com](https://www.gitkraken.com/learn/git/git-rebase#:~:text=Git%20pull%20rebase%20is%20a,behind%20the%20origin%2Fmain%20branch.)** + +So, what’s the difference between Git pull rebase and Git pull merge? While both of these options will combine the changes fetched from your remote, the outcome will look very different in your Git history. + +Git pull merge is the default method for combining changes in Git, and will merge the unpublished changes with the published changes, resulting in a merge commit. + +With Git pull rebase, on the other hand, the unpublished changes will be reapplied on top of the published changes and no new commit will be added to your history. + +With this in mind, you can see that Git pull rebase will result in a linear and cleaner project history by removing the unneeded merge commit. From 89da5479b47a5a4fbe63655d11fc7704a05d4c46 Mon Sep 17 00:00:00 2001 From: Isaac-Ofori-1 Date: Tue, 6 Jun 2023 15:47:11 -0400 Subject: [PATCH 19/27] resolved conflict --- Isaac_Rep | 1 + new_file_jack.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Isaac_Rep b/Isaac_Rep index cb6265a..e4f996f 100644 --- a/Isaac_Rep +++ b/Isaac_Rep @@ -1,3 +1,4 @@ This is a new one Isaac Ofori +This is a new one diff --git a/new_file_jack.txt b/new_file_jack.txt index d31dac7..c9ba432 100644 --- a/new_file_jack.txt +++ b/new_file_jack.txt @@ -1 +1 @@ -Sample text added to the new file to merge into Github. \ No newline at end of file +Sample text added to the new file to merge into Github. From 0a5c4f57b7c2372b5bdc316cea5f84fd531c213f Mon Sep 17 00:00:00 2001 From: Isaac-Ofori-1 Date: Tue, 6 Jun 2023 15:48:21 -0400 Subject: [PATCH 20/27] resolved conflict --- new_file_jack.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/new_file_jack.txt b/new_file_jack.txt index c9ba432..4f04df8 100644 --- a/new_file_jack.txt +++ b/new_file_jack.txt @@ -1 +1,2 @@ Sample text added to the new file to merge into Github. +Isaac made this change From d110aa6cab84b7f68bcc4ce8f6aa31216a860b31 Mon Sep 17 00:00:00 2001 From: Isaac-Ofori-1 Date: Tue, 6 Jun 2023 14:54:16 -0400 Subject: [PATCH 21/27] I changed Jack's file --- Isaac_Rep | 1 + 1 file changed, 1 insertion(+) diff --git a/Isaac_Rep b/Isaac_Rep index e4f996f..533a20a 100644 --- a/Isaac_Rep +++ b/Isaac_Rep @@ -2,3 +2,4 @@ This is a new one Isaac Ofori This is a new one +Added a new one From 5a3e3e97fb1c938de6c620487a6c1ccc0174f3bc Mon Sep 17 00:00:00 2001 From: Isaac-Ofori-1 Date: Tue, 6 Jun 2023 15:03:03 -0400 Subject: [PATCH 22/27] I made changes to Jack's file --- new_file_jack.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/new_file_jack.txt b/new_file_jack.txt index 4f04df8..0570e42 100644 --- a/new_file_jack.txt +++ b/new_file_jack.txt @@ -1,2 +1,2 @@ Sample text added to the new file to merge into Github. -Isaac made this change +Isaac made this change to Jack's file From a6b3996bbbf0c5f6305422ad9cdc9cb2759111e4 Mon Sep 17 00:00:00 2001 From: Isaac-Ofori-1 Date: Tue, 6 Jun 2023 15:09:25 -0400 Subject: [PATCH 23/27] I made changes to Jack's file --- new_file_jack.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/new_file_jack.txt b/new_file_jack.txt index 0570e42..18d7882 100644 --- a/new_file_jack.txt +++ b/new_file_jack.txt @@ -1,2 +1,2 @@ Sample text added to the new file to merge into Github. -Isaac made this change to Jack's file +Isaac made this change to Jack's file again From 6e730c7709c877b5e86f38d11cd35e38de6e2ac5 Mon Sep 17 00:00:00 2001 From: Isaac-Ofori-1 Date: Tue, 6 Jun 2023 15:13:08 -0400 Subject: [PATCH 24/27] I changed Jack's file --- new_file_jack.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/new_file_jack.txt b/new_file_jack.txt index 18d7882..17973f3 100644 --- a/new_file_jack.txt +++ b/new_file_jack.txt @@ -1,2 +1,2 @@ Sample text added to the new file to merge into Github. -Isaac made this change to Jack's file again +Isaac made this change to Jack's file again the 3rd time From 62dfb3daa0c9f63518cfa0370aca3f45d3e5072c Mon Sep 17 00:00:00 2001 From: Isaac-Ofori-1 Date: Tue, 6 Jun 2023 15:29:05 -0400 Subject: [PATCH 25/27] I changed Jack's file --- new_file_jack.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/new_file_jack.txt b/new_file_jack.txt index 17973f3..837a7c6 100644 --- a/new_file_jack.txt +++ b/new_file_jack.txt @@ -1,2 +1,2 @@ Sample text added to the new file to merge into Github. -Isaac made this change to Jack's file again the 3rd time +Isaac made this change to Jack's file again the 4th time From 7c0a1d36f0191107daf42a273e40a2131c65ca29 Mon Sep 17 00:00:00 2001 From: Isaac-Ofori-1 Date: Tue, 6 Jun 2023 15:58:41 -0400 Subject: [PATCH 26/27] Resolving again --- Isaac_Rep | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Isaac_Rep b/Isaac_Rep index 533a20a..dfb82f5 100644 --- a/Isaac_Rep +++ b/Isaac_Rep @@ -1,5 +1,5 @@ This is a new one Isaac Ofori -This is a new one -Added a new one +This is a new one from me + From bf08decc4c01a313578d9d6446cfc976de3090a6 Mon Sep 17 00:00:00 2001 From: Isaac-Ofori-1 Date: Tue, 6 Jun 2023 15:59:48 -0400 Subject: [PATCH 27/27] made changes to Jack's file --- new_file_jack.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/new_file_jack.txt b/new_file_jack.txt index 837a7c6..a36763a 100644 --- a/new_file_jack.txt +++ b/new_file_jack.txt @@ -1,2 +1,2 @@ Sample text added to the new file to merge into Github. -Isaac made this change to Jack's file again the 4th time +Isaac made this change to Jack's file again the 4th time then again