From 9f0b591ee3f5ac8a0eecdafe4e9cdcc686d87337 Mon Sep 17 00:00:00 2001 From: saradufour Date: Thu, 20 Mar 2025 14:35:34 +0100 Subject: [PATCH 01/40] creation of the folder structure for Markdown concepts --- Markdown-concepts/Markdown_Sheat-cheet.md | 1 + Markdown-concepts/Markdown_concepts.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 Markdown-concepts/Markdown_Sheat-cheet.md create mode 100644 Markdown-concepts/Markdown_concepts.md diff --git a/Markdown-concepts/Markdown_Sheat-cheet.md b/Markdown-concepts/Markdown_Sheat-cheet.md new file mode 100644 index 0000000..4d3ec3b --- /dev/null +++ b/Markdown-concepts/Markdown_Sheat-cheet.md @@ -0,0 +1 @@ +# Markdown cheat sheet \ No newline at end of file diff --git a/Markdown-concepts/Markdown_concepts.md b/Markdown-concepts/Markdown_concepts.md new file mode 100644 index 0000000..99a7b1b --- /dev/null +++ b/Markdown-concepts/Markdown_concepts.md @@ -0,0 +1 @@ +# Markdown concepts From b2633cf758454f41c6a6083ae9656965b8a491c6 Mon Sep 17 00:00:00 2001 From: leenput Date: Thu, 20 Mar 2025 14:36:15 +0100 Subject: [PATCH 02/40] Initiate folder structure for git and github concepts. Adding leena branch. --- git_and_github_concepts/git_cheat_sheet.md | 1 + git_and_github_concepts/git_concepts.md | 8 ++++++++ images/github_logo.png | Bin 0 -> 5271 bytes images/github_logo.png:Zone.Identifier | 0 4 files changed, 9 insertions(+) create mode 100644 git_and_github_concepts/git_cheat_sheet.md create mode 100644 git_and_github_concepts/git_concepts.md create mode 100644 images/github_logo.png create mode 100644 images/github_logo.png:Zone.Identifier diff --git a/git_and_github_concepts/git_cheat_sheet.md b/git_and_github_concepts/git_cheat_sheet.md new file mode 100644 index 0000000..266af61 --- /dev/null +++ b/git_and_github_concepts/git_cheat_sheet.md @@ -0,0 +1 @@ +##This is a cheat sheet for git and github \ No newline at end of file diff --git a/git_and_github_concepts/git_concepts.md b/git_and_github_concepts/git_concepts.md new file mode 100644 index 0000000..d903018 --- /dev/null +++ b/git_and_github_concepts/git_concepts.md @@ -0,0 +1,8 @@ +##Start a repository: + + + + +##Branches + + diff --git a/images/github_logo.png b/images/github_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..7cc3552a623fae994cecc08c56ec15ff87e0cdef GIT binary patch literal 5271 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 SZR+s9O-)rjm9j_3u>S*{#QYBc literal 0 HcmV?d00001 diff --git a/images/github_logo.png:Zone.Identifier b/images/github_logo.png:Zone.Identifier new file mode 100644 index 0000000..e69de29 From 34bfa2f3329f2fe165aa97d961c929ac55bd6dad Mon Sep 17 00:00:00 2001 From: saradufour Date: Thu, 20 Mar 2025 14:49:46 +0100 Subject: [PATCH 03/40] adding a .gitignore file to the repository --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2c5f747 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +#the files listed below can be ignored +Github_UsernameSara.png From d359173787b47044b79367b0b3127f6407ed9fca Mon Sep 17 00:00:00 2001 From: leenput Date: Thu, 20 Mar 2025 15:03:20 +0100 Subject: [PATCH 04/40] Added a general license.md file --- LICENSE.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 LICENSE.md diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..8d5b307 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,22 @@ +Copyright (c) 2025 GitHub, Inc. + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. From e96e36a2850106962c77b962e00428cfc0198768 Mon Sep 17 00:00:00 2001 From: saradufour Date: Thu, 20 Mar 2025 16:27:44 +0100 Subject: [PATCH 05/40] adding header, bold and italic featues in markdown tet to the cheat sheet and basic principles of Markdown --- Markdown-concepts/Markdown_Sheat-cheet.md | 14 +++++++++++++- Markdown-concepts/Markdown_concepts.md | 4 ++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Markdown-concepts/Markdown_Sheat-cheet.md b/Markdown-concepts/Markdown_Sheat-cheet.md index 4d3ec3b..f50509c 100644 --- a/Markdown-concepts/Markdown_Sheat-cheet.md +++ b/Markdown-concepts/Markdown_Sheat-cheet.md @@ -1 +1,13 @@ -# Markdown cheat sheet \ No newline at end of file +# Markdown cheat sheet + +# Header 1 +`use # HEADER` +## Header 2 +`use ## HEADER` +### Header 3 +`use ### HEADER` + + +**Bold text** (place text in between `** TEXT **`) + +**Italic text** (place text in between `* TEXT *` or `_ TEXT _`) \ No newline at end of file diff --git a/Markdown-concepts/Markdown_concepts.md b/Markdown-concepts/Markdown_concepts.md index 99a7b1b..7f40d08 100644 --- a/Markdown-concepts/Markdown_concepts.md +++ b/Markdown-concepts/Markdown_concepts.md @@ -1 +1,5 @@ # Markdown concepts + +Markdown is a markup language used for adding formatting elements to a text document. + +It is often used for web development, documentation, blogging, etc \ No newline at end of file From 4fd804ddb7736f30377df2d2804b5d591ab3aa03 Mon Sep 17 00:00:00 2001 From: saradufour Date: Thu, 20 Mar 2025 16:29:26 +0100 Subject: [PATCH 06/40] Revert "adding header, bold and italic featues in markdown tet to the cheat sheet and basic principles of Markdown" This reverts commit e96e36a2850106962c77b962e00428cfc0198768. --- Markdown-concepts/Markdown_Sheat-cheet.md | 14 +------------- Markdown-concepts/Markdown_concepts.md | 4 ---- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/Markdown-concepts/Markdown_Sheat-cheet.md b/Markdown-concepts/Markdown_Sheat-cheet.md index f50509c..4d3ec3b 100644 --- a/Markdown-concepts/Markdown_Sheat-cheet.md +++ b/Markdown-concepts/Markdown_Sheat-cheet.md @@ -1,13 +1 @@ -# Markdown cheat sheet - -# Header 1 -`use # HEADER` -## Header 2 -`use ## HEADER` -### Header 3 -`use ### HEADER` - - -**Bold text** (place text in between `** TEXT **`) - -**Italic text** (place text in between `* TEXT *` or `_ TEXT _`) \ No newline at end of file +# Markdown cheat sheet \ No newline at end of file diff --git a/Markdown-concepts/Markdown_concepts.md b/Markdown-concepts/Markdown_concepts.md index 7f40d08..99a7b1b 100644 --- a/Markdown-concepts/Markdown_concepts.md +++ b/Markdown-concepts/Markdown_concepts.md @@ -1,5 +1 @@ # Markdown concepts - -Markdown is a markup language used for adding formatting elements to a text document. - -It is often used for web development, documentation, blogging, etc \ No newline at end of file From 47862102c4df396165e99d26658ecd180881e530 Mon Sep 17 00:00:00 2001 From: saradufour Date: Thu, 20 Mar 2025 16:30:18 +0100 Subject: [PATCH 07/40] Revert "Revert "adding header, bold and italic featues in markdown tet to the cheat sheet and basic principles of Markdown"" This reverts commit 4fd804ddb7736f30377df2d2804b5d591ab3aa03. --- Markdown-concepts/Markdown_Sheat-cheet.md | 14 +++++++++++++- Markdown-concepts/Markdown_concepts.md | 4 ++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Markdown-concepts/Markdown_Sheat-cheet.md b/Markdown-concepts/Markdown_Sheat-cheet.md index 4d3ec3b..f50509c 100644 --- a/Markdown-concepts/Markdown_Sheat-cheet.md +++ b/Markdown-concepts/Markdown_Sheat-cheet.md @@ -1 +1,13 @@ -# Markdown cheat sheet \ No newline at end of file +# Markdown cheat sheet + +# Header 1 +`use # HEADER` +## Header 2 +`use ## HEADER` +### Header 3 +`use ### HEADER` + + +**Bold text** (place text in between `** TEXT **`) + +**Italic text** (place text in between `* TEXT *` or `_ TEXT _`) \ No newline at end of file diff --git a/Markdown-concepts/Markdown_concepts.md b/Markdown-concepts/Markdown_concepts.md index 99a7b1b..7f40d08 100644 --- a/Markdown-concepts/Markdown_concepts.md +++ b/Markdown-concepts/Markdown_concepts.md @@ -1 +1,5 @@ # Markdown concepts + +Markdown is a markup language used for adding formatting elements to a text document. + +It is often used for web development, documentation, blogging, etc \ No newline at end of file From 364e6d47d402575ee55babad17d9b2306ec090aa Mon Sep 17 00:00:00 2001 From: leenput Date: Fri, 21 Mar 2025 22:09:07 +0100 Subject: [PATCH 08/40] Update git_concepts.md with general concepts and information on conceptual areas --- git_and_github_concepts/git_concepts.md | 39 ++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/git_and_github_concepts/git_concepts.md b/git_and_github_concepts/git_concepts.md index d903018..3e40e3b 100644 --- a/git_and_github_concepts/git_concepts.md +++ b/git_and_github_concepts/git_concepts.md @@ -1,7 +1,44 @@ -##Start a repository: +# GIT AND GITHUB CONCEPTS +## What is Git and Github? +**Git:** +Git is a software to create a timeline of your projects. It keeps track of all changes you make during your project development and allows you to go back to each version at any point in time. You can save changes, and once you commit them to a version that is a snapshot in time. +**Github:** +Online repository to collect different git projects. Github is an online backup of all your timelines that were created in git. +## How to start your timeline/repository? +**Start a local repository:** +When you are in your local project folder, you can start the timeline by initializing git, this will create a .git file. Git tracks every subfolder in your root folder, so no need to initialize it twice. +`git init` + +**Start from a remote repository:** +On github, you can go to a remote repository, and clone it to your local machine. No need to initialize the timeline again. +`git clone ssh-address-repository` + +## Where is Git/GitHub? Three conceptual areas: +**1. Developing area** +My computer: developing area with local folder where project is developed. + +**2. Preparation: staging area?** +If we do `git add`, we send it to the staging area, which is the place where you add files to prepare for commit. Location to prepare new snapshots to the timeline (before commit). + +**3. Local repostitory: where is the timeline?** +The local repository on your computer is where all the versions live. It is the .git folder you have initialized. Typically only text files. + +**4. Remote area: GitHub** +It is the remote repository. You first need to make a repository in GitHub, then you can use the ssh address of the repository to make a bridge on your computer to the remote repository. After that, you can push your local repository to the remote one. Make sure to always clean up your working tree first (check with git status). + +WORKING ORDER: +1. adjust your files and save (developing area) +2. once you are ready, you should do: +`git add file_A`: send a copy of the file to the staging area\ +`git add *`: send a copy of all modified files to the staging area\ +3. commit changes: +`git commit -m "message"`: you send from staging area to local commit, linked to a meaningful message.\ + +4. push changes to remote repository: +`git push`: send commit to remote areay ##Branches From a7a5ef8fc90fdea5f04e83884a41d15acf4eda44 Mon Sep 17 00:00:00 2001 From: leenput Date: Sun, 23 Mar 2025 10:11:45 +0100 Subject: [PATCH 09/40] Updated git_concepts.md file with section on collaborations on git & github --- git_and_github_concepts/git_concepts.md | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/git_and_github_concepts/git_concepts.md b/git_and_github_concepts/git_concepts.md index 3e40e3b..b02f8d4 100644 --- a/git_and_github_concepts/git_concepts.md +++ b/git_and_github_concepts/git_concepts.md @@ -13,9 +13,11 @@ When you are in your local project folder, you can start the timeline by initial `git init` **Start from a remote repository:** -On github, you can go to a remote repository, and clone it to your local machine. No need to initialize the timeline again. +1. On github, you can go to a remote repository, and clone it to your local machine. No need to initialize the timeline again. `git clone ssh-address-repository` +2. You can also first 'fork' to create a personal copy of a repository on GitHub. It allows you to freely experiment with changes without affecting the orignal repository. + ## Where is Git/GitHub? Three conceptual areas: **1. Developing area** My computer: developing area with local folder where project is developed. @@ -29,7 +31,7 @@ The local repository on your computer is where all the versions live. It is the **4. Remote area: GitHub** It is the remote repository. You first need to make a repository in GitHub, then you can use the ssh address of the repository to make a bridge on your computer to the remote repository. After that, you can push your local repository to the remote one. Make sure to always clean up your working tree first (check with git status). -WORKING ORDER: +GIT WORKFLOW: 1. adjust your files and save (developing area) 2. once you are ready, you should do: `git add file_A`: send a copy of the file to the staging area\ @@ -40,6 +42,18 @@ WORKING ORDER: 4. push changes to remote repository: `git push`: send commit to remote areay +5. retrieve remote changes locally +`git pull`: get updates + +## Collaborations: +**Adding collaborators:** You can grant other GitHub users access to your repository as collaborators, allowing them to push changes. + +**Pulling changes:** pulling fetches changes from a remote repository and merges them into the current branch. + +**Conflicts:** If you are working with someone simultaneously and somebody pushes it before you, this will create a conflict, because Git cannot automatically merge changes. When you try to push your modifications, you will get an error. You need to manually resolve conflicts by editing the conflicting files. For this, you first need to pull the latest version (containing the commit of your collaborator), then you can modify the file and look at the conflict closely and resolve. After that, you need to git add, commit and push it again. + +**Code review:** GitHub allows reviewers to leave comments and sugges changes on pull requests, facilitating a collaborative code review process. + ##Branches From d7ab94dab205d497201828ef6fea9de0469a39a6 Mon Sep 17 00:00:00 2001 From: leenput Date: Sun, 23 Mar 2025 10:32:23 +0100 Subject: [PATCH 10/40] Updated git_concepts.md file with information on branches --- git_and_github_concepts/git_concepts.md | 27 ++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/git_and_github_concepts/git_concepts.md b/git_and_github_concepts/git_concepts.md index b02f8d4..d540bcb 100644 --- a/git_and_github_concepts/git_concepts.md +++ b/git_and_github_concepts/git_concepts.md @@ -52,8 +52,29 @@ GIT WORKFLOW: **Conflicts:** If you are working with someone simultaneously and somebody pushes it before you, this will create a conflict, because Git cannot automatically merge changes. When you try to push your modifications, you will get an error. You need to manually resolve conflicts by editing the conflicting files. For this, you first need to pull the latest version (containing the commit of your collaborator), then you can modify the file and look at the conflict closely and resolve. After that, you need to git add, commit and push it again. -**Code review:** GitHub allows reviewers to leave comments and sugges changes on pull requests, facilitating a collaborative code review process. - -##Branches +**Pull requests:** A pull request is a way to propose changes to a repository and facilitate collaborations. You create a pull request when you want to merge changes from one branch into another, and you need someone to review and approve them before merging. + 1. Push your changes to github + 2. Open GitHub and navitage to your repository + 3. Click the "Pull Requests" tab and create a new pull request, selecting your feature branch and the main branch + 4. Once reviewed, the pull request can be merged. + +## Tag a commit +You can use git tag to tag/commit a useful commit in your timeline. This can be a stable release, a specific version,.. +When you push, you need to add git push --tags as well. +git tag -d to delete a tag, but you also need to delete it manually on github. + +## Branches +A branch is an independent timeline that roots from the main timeline. You can use it to work independently on same project, to experiment without risk, etc. +`git branch `: initiate a new branch + +To move between branches you need to do git checkout. +`git checkout `: switches between branches. + +Once you’ve completed work on a branch, you can merge it back into the main branch: +- first switch to the main branch: `git checkout main` +- merge your branch with main: `git merge ` + +Once merged, you can delete the branch: +`git branch -d ` From 972d19550eacb74e4ebdd8d4cece2426689684f4 Mon Sep 17 00:00:00 2001 From: leenput Date: Mon, 24 Mar 2025 17:09:35 +0100 Subject: [PATCH 11/40] Updated git_concepts.md file with .gitignore concept and how to keep track of your project workflow --- git_and_github_concepts/git_concepts.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/git_and_github_concepts/git_concepts.md b/git_and_github_concepts/git_concepts.md index d540bcb..d11b7fe 100644 --- a/git_and_github_concepts/git_concepts.md +++ b/git_and_github_concepts/git_concepts.md @@ -77,4 +77,15 @@ Once you’ve completed work on a branch, you can merge it back into the main br Once merged, you can delete the branch: `git branch -d ` +## What is a .gitignore file? +In many cases, the project creates a lot of logs and other irrelevant files which are to be ignored. So to ignore those files, we have to put their names in“.gitignore” file. +The .gitignore file specifies files and directories that should be ignored by Git. It is used to prevent certain files from being tracked or committed. + +## GitHub history and keeping track of commits +You can create an overview of what commits have been done in the entire history of your project. It shows you the commit hashes (IDs), the author and date of the commit, and the message that was assigned to it. It is great for reviewing past changes or finding a specific commit. +`git log`: display commit history + +You can keep track of what is going on in your working directory and staging area using git status. +`git status`: it shows you which files have been modified, which files are staged and which are untracked (new and not in git yet) + From 9598a1e56644197f2f9f4f7df3b449d3bcbeca5e Mon Sep 17 00:00:00 2001 From: leenput Date: Mon, 24 Mar 2025 17:18:22 +0100 Subject: [PATCH 12/40] After git reset and some confusion, updated git_concepts.md with git diff --- git_and_github_concepts/git_concepts.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git_and_github_concepts/git_concepts.md b/git_and_github_concepts/git_concepts.md index d11b7fe..b36426a 100644 --- a/git_and_github_concepts/git_concepts.md +++ b/git_and_github_concepts/git_concepts.md @@ -88,4 +88,7 @@ You can create an overview of what commits have been done in the entire history You can keep track of what is going on in your working directory and staging area using git status. `git status`: it shows you which files have been modified, which files are staged and which are untracked (new and not in git yet) - +To compare different commits or files you can use git diff. +1. `git diff`: see unstaged changes (working directory vs last commit) +2. `git diff --cached` or `git diff --staged`: see staged changes (staging area vs last commit) +3. `git diff `: compare two commits From 60e333a8bcf04f2e11c97876e87ad7f1fb0ea54d Mon Sep 17 00:00:00 2001 From: Rafael Andrade Buono Date: Tue, 25 Mar 2025 14:09:09 +0100 Subject: [PATCH 13/40] markdown format corrections and typo fixes on git_concepts.md before adding new content --- git_and_github_concepts/git_concepts.md | 52 ++++++++++++------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/git_and_github_concepts/git_concepts.md b/git_and_github_concepts/git_concepts.md index d540bcb..dfb939e 100644 --- a/git_and_github_concepts/git_concepts.md +++ b/git_and_github_concepts/git_concepts.md @@ -8,41 +8,41 @@ Git is a software to create a timeline of your projects. It keeps track of all c Online repository to collect different git projects. Github is an online backup of all your timelines that were created in git. ## How to start your timeline/repository? -**Start a local repository:** -When you are in your local project folder, you can start the timeline by initializing git, this will create a .git file. Git tracks every subfolder in your root folder, so no need to initialize it twice. +**Start a local repository:** +When you are in your local project folder, you can start the timeline by initializing git, this will create a .git file. Git tracks every subfolder in your root folder, so no need to initialize it twice. `git init` -**Start from a remote repository:** -1. On github, you can go to a remote repository, and clone it to your local machine. No need to initialize the timeline again. +**Start from a remote repository:** +1. On github, you can go to a remote repository, and clone it to your local machine. No need to initialize the timeline again. `git clone ssh-address-repository` -2. You can also first 'fork' to create a personal copy of a repository on GitHub. It allows you to freely experiment with changes without affecting the orignal repository. +2. You can also first 'fork' to create a personal copy of a repository on GitHub. It allows you to freely experiment with changes without affecting the original repository. ## Where is Git/GitHub? Three conceptual areas: -**1. Developing area** +**1. Developing area** My computer: developing area with local folder where project is developed. -**2. Preparation: staging area?** +**2. Preparation: staging area?** If we do `git add`, we send it to the staging area, which is the place where you add files to prepare for commit. Location to prepare new snapshots to the timeline (before commit). -**3. Local repostitory: where is the timeline?** +**3. Local repository: where is the timeline?** The local repository on your computer is where all the versions live. It is the .git folder you have initialized. Typically only text files. -**4. Remote area: GitHub** +**4. Remote area: GitHub** It is the remote repository. You first need to make a repository in GitHub, then you can use the ssh address of the repository to make a bridge on your computer to the remote repository. After that, you can push your local repository to the remote one. Make sure to always clean up your working tree first (check with git status). GIT WORKFLOW: 1. adjust your files and save (developing area) -2. once you are ready, you should do: -`git add file_A`: send a copy of the file to the staging area\ -`git add *`: send a copy of all modified files to the staging area\ +2. once you are ready, you should do: +`git add file_A`: send a copy of the file to the staging area +`git add *`: send a copy of all modified files to the staging area 3. commit changes: -`git commit -m "message"`: you send from staging area to local commit, linked to a meaningful message.\ +`git commit -m "message"`: you send from staging area to local commit, linked to a meaningful message. -4. push changes to remote repository: -`git push`: send commit to remote areay +4. push changes to remote repository: +`git push`: send commit to remote area -5. retrieve remote changes locally +5. retrieve remote changes locally: `git pull`: get updates ## Collaborations: @@ -52,11 +52,11 @@ GIT WORKFLOW: **Conflicts:** If you are working with someone simultaneously and somebody pushes it before you, this will create a conflict, because Git cannot automatically merge changes. When you try to push your modifications, you will get an error. You need to manually resolve conflicts by editing the conflicting files. For this, you first need to pull the latest version (containing the commit of your collaborator), then you can modify the file and look at the conflict closely and resolve. After that, you need to git add, commit and push it again. -**Pull requests:** A pull request is a way to propose changes to a repository and facilitate collaborations. You create a pull request when you want to merge changes from one branch into another, and you need someone to review and approve them before merging. - 1. Push your changes to github - 2. Open GitHub and navitage to your repository - 3. Click the "Pull Requests" tab and create a new pull request, selecting your feature branch and the main branch - 4. Once reviewed, the pull request can be merged. +**Pull requests:** A pull request is a way to propose changes to a repository and facilitate collaborations. You create a pull request when you want to merge changes from one branch into another, and you need someone to review and approve them before merging. + 1. Push your changes to github + 2. Open GitHub and navigate to your repository + 3. Click the "Pull Requests" tab and create a new pull request, selecting your feature branch and the main branch + 4. Once reviewed, the pull request can be merged. ## Tag a commit You can use git tag to tag/commit a useful commit in your timeline. This can be a stable release, a specific version,.. @@ -67,14 +67,14 @@ git tag -d to delete a tag, but you also need to delete it manually on gi A branch is an independent timeline that roots from the main timeline. You can use it to work independently on same project, to experiment without risk, etc. `git branch `: initiate a new branch -To move between branches you need to do git checkout. +To move between branches you need to do git checkout. `git checkout `: switches between branches. -Once you’ve completed work on a branch, you can merge it back into the main branch: -- first switch to the main branch: `git checkout main` -- merge your branch with main: `git merge ` +Once you’ve completed work on a branch, you can merge it back into the main branch: +- first switch to the main branch: `git checkout main` +- merge your branch with main: `git merge ` -Once merged, you can delete the branch: +Once merged, you can delete the branch: `git branch -d ` From a24f27c26db398d22721f9e9d7bac802d4217b87 Mon Sep 17 00:00:00 2001 From: rabuono Date: Tue, 25 Mar 2025 14:23:09 +0100 Subject: [PATCH 14/40] minor text style fixes to git_concepts.md for readability --- git_and_github_concepts/git_concepts.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/git_and_github_concepts/git_concepts.md b/git_and_github_concepts/git_concepts.md index dfb939e..62b3a42 100644 --- a/git_and_github_concepts/git_concepts.md +++ b/git_and_github_concepts/git_concepts.md @@ -5,7 +5,7 @@ Git is a software to create a timeline of your projects. It keeps track of all changes you make during your project development and allows you to go back to each version at any point in time. You can save changes, and once you commit them to a version that is a snapshot in time. **Github:** -Online repository to collect different git projects. Github is an online backup of all your timelines that were created in git. +Online repository to collect different git projects. GitHub is an online backup of all your timelines that were created in git. ## How to start your timeline/repository? **Start a local repository:** @@ -28,8 +28,8 @@ If we do `git add`, we send it to the staging area, which is the place where you **3. Local repository: where is the timeline?** The local repository on your computer is where all the versions live. It is the .git folder you have initialized. Typically only text files. -**4. Remote area: GitHub** -It is the remote repository. You first need to make a repository in GitHub, then you can use the ssh address of the repository to make a bridge on your computer to the remote repository. After that, you can push your local repository to the remote one. Make sure to always clean up your working tree first (check with git status). +**4. Remote area (GitHub):** +It is the remote repository. In the context of this course, we use GitHub. You first need to make a repository in GitHub, then you can use the ssh address of the repository to make a bridge on your computer to the remote repository. After that, you can push your local repository to the remote one. Make sure to always clean up your working tree first (check with `git status`). GIT WORKFLOW: 1. adjust your files and save (developing area) From 6384fdfd6fb661ee18560e5a30eb6355139290fa Mon Sep 17 00:00:00 2001 From: rabuono Date: Tue, 25 Mar 2025 14:31:33 +0100 Subject: [PATCH 15/40] Revert "markdown format corrections and typo fixes on git_concepts.md before adding new content" This reverts commit 60e333a8bcf04f2e11c97876e87ad7f1fb0ea54d. --- git_and_github_concepts/git_concepts.md | 50 ++++++++++++------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/git_and_github_concepts/git_concepts.md b/git_and_github_concepts/git_concepts.md index 62b3a42..ab31f74 100644 --- a/git_and_github_concepts/git_concepts.md +++ b/git_and_github_concepts/git_concepts.md @@ -8,24 +8,24 @@ Git is a software to create a timeline of your projects. It keeps track of all c Online repository to collect different git projects. GitHub is an online backup of all your timelines that were created in git. ## How to start your timeline/repository? -**Start a local repository:** -When you are in your local project folder, you can start the timeline by initializing git, this will create a .git file. Git tracks every subfolder in your root folder, so no need to initialize it twice. +**Start a local repository:** +When you are in your local project folder, you can start the timeline by initializing git, this will create a .git file. Git tracks every subfolder in your root folder, so no need to initialize it twice. `git init` -**Start from a remote repository:** -1. On github, you can go to a remote repository, and clone it to your local machine. No need to initialize the timeline again. +**Start from a remote repository:** +1. On github, you can go to a remote repository, and clone it to your local machine. No need to initialize the timeline again. `git clone ssh-address-repository` -2. You can also first 'fork' to create a personal copy of a repository on GitHub. It allows you to freely experiment with changes without affecting the original repository. +2. You can also first 'fork' to create a personal copy of a repository on GitHub. It allows you to freely experiment with changes without affecting the orignal repository. ## Where is Git/GitHub? Three conceptual areas: -**1. Developing area** +**1. Developing area** My computer: developing area with local folder where project is developed. -**2. Preparation: staging area?** +**2. Preparation: staging area?** If we do `git add`, we send it to the staging area, which is the place where you add files to prepare for commit. Location to prepare new snapshots to the timeline (before commit). -**3. Local repository: where is the timeline?** +**3. Local repostitory: where is the timeline?** The local repository on your computer is where all the versions live. It is the .git folder you have initialized. Typically only text files. **4. Remote area (GitHub):** @@ -33,16 +33,16 @@ It is the remote repository. In the context of this course, we use GitHub. You f GIT WORKFLOW: 1. adjust your files and save (developing area) -2. once you are ready, you should do: -`git add file_A`: send a copy of the file to the staging area -`git add *`: send a copy of all modified files to the staging area +2. once you are ready, you should do: +`git add file_A`: send a copy of the file to the staging area\ +`git add *`: send a copy of all modified files to the staging area\ 3. commit changes: -`git commit -m "message"`: you send from staging area to local commit, linked to a meaningful message. +`git commit -m "message"`: you send from staging area to local commit, linked to a meaningful message.\ -4. push changes to remote repository: -`git push`: send commit to remote area +4. push changes to remote repository: +`git push`: send commit to remote areay -5. retrieve remote changes locally: +5. retrieve remote changes locally `git pull`: get updates ## Collaborations: @@ -52,11 +52,11 @@ GIT WORKFLOW: **Conflicts:** If you are working with someone simultaneously and somebody pushes it before you, this will create a conflict, because Git cannot automatically merge changes. When you try to push your modifications, you will get an error. You need to manually resolve conflicts by editing the conflicting files. For this, you first need to pull the latest version (containing the commit of your collaborator), then you can modify the file and look at the conflict closely and resolve. After that, you need to git add, commit and push it again. -**Pull requests:** A pull request is a way to propose changes to a repository and facilitate collaborations. You create a pull request when you want to merge changes from one branch into another, and you need someone to review and approve them before merging. - 1. Push your changes to github - 2. Open GitHub and navigate to your repository - 3. Click the "Pull Requests" tab and create a new pull request, selecting your feature branch and the main branch - 4. Once reviewed, the pull request can be merged. +**Pull requests:** A pull request is a way to propose changes to a repository and facilitate collaborations. You create a pull request when you want to merge changes from one branch into another, and you need someone to review and approve them before merging. + 1. Push your changes to github + 2. Open GitHub and navitage to your repository + 3. Click the "Pull Requests" tab and create a new pull request, selecting your feature branch and the main branch + 4. Once reviewed, the pull request can be merged. ## Tag a commit You can use git tag to tag/commit a useful commit in your timeline. This can be a stable release, a specific version,.. @@ -67,14 +67,14 @@ git tag -d to delete a tag, but you also need to delete it manually on gi A branch is an independent timeline that roots from the main timeline. You can use it to work independently on same project, to experiment without risk, etc. `git branch `: initiate a new branch -To move between branches you need to do git checkout. +To move between branches you need to do git checkout. `git checkout `: switches between branches. -Once you’ve completed work on a branch, you can merge it back into the main branch: -- first switch to the main branch: `git checkout main` -- merge your branch with main: `git merge ` +Once you’ve completed work on a branch, you can merge it back into the main branch: +- first switch to the main branch: `git checkout main` +- merge your branch with main: `git merge ` -Once merged, you can delete the branch: +Once merged, you can delete the branch: `git branch -d ` From 4ddc8a755e13dd770667ae4ea880fcc0fd0deb75 Mon Sep 17 00:00:00 2001 From: rabuono Date: Tue, 25 Mar 2025 14:39:32 +0100 Subject: [PATCH 16/40] format and typo fixes and addition of GitHub information in git_concepts.md --- git_and_github_concepts/git_concepts.md | 61 ++++++++++++++----------- 1 file changed, 34 insertions(+), 27 deletions(-) diff --git a/git_and_github_concepts/git_concepts.md b/git_and_github_concepts/git_concepts.md index ab31f74..9f80e00 100644 --- a/git_and_github_concepts/git_concepts.md +++ b/git_and_github_concepts/git_concepts.md @@ -4,28 +4,34 @@ **Git:** Git is a software to create a timeline of your projects. It keeps track of all changes you make during your project development and allows you to go back to each version at any point in time. You can save changes, and once you commit them to a version that is a snapshot in time. -**Github:** -Online repository to collect different git projects. GitHub is an online backup of all your timelines that were created in git. +**GitHub:** +Online repository to collect different git projects. GitHub can be used as an online backup of all your timelines that were created in git. As a web-based platform, GitHub offers several features that extend beyond the basic functionalities of git. These include: +- Repository Hosting: GitHub hosts Git repositories online, making them accessible from anywhere. +- Pull Requests: This feature allows developers to propose changes to a codebase, review code, and discuss modifications before merging. +- Issues and Bug Tracking: GitHub provides a built-in issue tracker to manage bugs, feature requests, and other tasks. +- Project Management Tools: GitHub offers project boards, milestones, and other tools to help manage and organize development tasks. +- Code Reviews: GitHub facilitates code reviews with inline comments and discussions on pull requests. +- Actions and CI/CD: GitHub Actions allows you to automate workflows, including continuous integration and continuous deployment (CI/CD). ## How to start your timeline/repository? -**Start a local repository:** -When you are in your local project folder, you can start the timeline by initializing git, this will create a .git file. Git tracks every subfolder in your root folder, so no need to initialize it twice. +**Start a local repository:** +When you are in your local project folder, you can start the timeline by initializing git, this will create a .git file. Git tracks every subfolder in your root folder, so no need to initialize it twice. `git init` -**Start from a remote repository:** -1. On github, you can go to a remote repository, and clone it to your local machine. No need to initialize the timeline again. +**Start from a remote repository:** +1. On github, you can go to a remote repository, and clone it to your local machine. No need to initialize the timeline again. `git clone ssh-address-repository` -2. You can also first 'fork' to create a personal copy of a repository on GitHub. It allows you to freely experiment with changes without affecting the orignal repository. +2. You can also first 'fork' to create a personal copy of a repository on GitHub. It allows you to freely experiment with changes without affecting the original repository. ## Where is Git/GitHub? Three conceptual areas: -**1. Developing area** +**1. Developing area** My computer: developing area with local folder where project is developed. -**2. Preparation: staging area?** +**2. Preparation: staging area?** If we do `git add`, we send it to the staging area, which is the place where you add files to prepare for commit. Location to prepare new snapshots to the timeline (before commit). -**3. Local repostitory: where is the timeline?** +**3. Local repository: where is the timeline?** The local repository on your computer is where all the versions live. It is the .git folder you have initialized. Typically only text files. **4. Remote area (GitHub):** @@ -33,16 +39,16 @@ It is the remote repository. In the context of this course, we use GitHub. You f GIT WORKFLOW: 1. adjust your files and save (developing area) -2. once you are ready, you should do: -`git add file_A`: send a copy of the file to the staging area\ -`git add *`: send a copy of all modified files to the staging area\ +2. once you are ready, you should do: +`git add file_A`: send a copy of the file to the staging area +`git add *`: send a copy of all modified files to the staging area 3. commit changes: -`git commit -m "message"`: you send from staging area to local commit, linked to a meaningful message.\ +`git commit -m "message"`: you send from staging area to local commit, linked to a meaningful message. -4. push changes to remote repository: -`git push`: send commit to remote areay +4. push changes to remote repository: +`git push`: send commit to remote area -5. retrieve remote changes locally +5. retrieve remote changes locally: `git pull`: get updates ## Collaborations: @@ -52,11 +58,11 @@ GIT WORKFLOW: **Conflicts:** If you are working with someone simultaneously and somebody pushes it before you, this will create a conflict, because Git cannot automatically merge changes. When you try to push your modifications, you will get an error. You need to manually resolve conflicts by editing the conflicting files. For this, you first need to pull the latest version (containing the commit of your collaborator), then you can modify the file and look at the conflict closely and resolve. After that, you need to git add, commit and push it again. -**Pull requests:** A pull request is a way to propose changes to a repository and facilitate collaborations. You create a pull request when you want to merge changes from one branch into another, and you need someone to review and approve them before merging. - 1. Push your changes to github - 2. Open GitHub and navitage to your repository - 3. Click the "Pull Requests" tab and create a new pull request, selecting your feature branch and the main branch - 4. Once reviewed, the pull request can be merged. +**Pull requests:** A pull request is a way to propose changes to a repository and facilitate collaborations. You create a pull request when you want to merge changes from one branch into another, and you need someone to review and approve them before merging. + 1. Push your changes to github + 2. Open GitHub and navigate to your repository + 3. Click the "Pull Requests" tab and create a new pull request, selecting your feature branch and the main branch + 4. Once reviewed, the pull request can be merged. ## Tag a commit You can use git tag to tag/commit a useful commit in your timeline. This can be a stable release, a specific version,.. @@ -67,14 +73,15 @@ git tag -d to delete a tag, but you also need to delete it manually on gi A branch is an independent timeline that roots from the main timeline. You can use it to work independently on same project, to experiment without risk, etc. `git branch `: initiate a new branch -To move between branches you need to do git checkout. +To move between branches you need to do git checkout. `git checkout `: switches between branches. -Once you’ve completed work on a branch, you can merge it back into the main branch: -- first switch to the main branch: `git checkout main` -- merge your branch with main: `git merge ` +Once you’ve completed work on a branch, you can merge it back into the main branch: +- first switch to the main branch: `git checkout main` +- merge your branch with main: `git merge ` -Once merged, you can delete the branch: +Once merged, you can delete the branch: `git branch -d ` + From 8c35670639db9e428624bfc4a5eda205905699a3 Mon Sep 17 00:00:00 2001 From: rabuono Date: Tue, 25 Mar 2025 15:49:02 +0100 Subject: [PATCH 17/40] reformat and expand tag concept in git_concepts.md --- git_and_github_concepts/git_concepts.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/git_and_github_concepts/git_concepts.md b/git_and_github_concepts/git_concepts.md index 9f80e00..75166ea 100644 --- a/git_and_github_concepts/git_concepts.md +++ b/git_and_github_concepts/git_concepts.md @@ -65,9 +65,10 @@ GIT WORKFLOW: 4. Once reviewed, the pull request can be merged. ## Tag a commit -You can use git tag to tag/commit a useful commit in your timeline. This can be a stable release, a specific version,.. -When you push, you need to add git push --tags as well. -git tag -d to delete a tag, but you also need to delete it manually on github. +Git allows to create tags to mark specific points in the timeline of your repository. Tags can be used to specify specific versions of the code in a project. They can also be used to denote significant milestones in the development process. +You can use `git tag ` to add a tag to a commit in your timeline. +It is important to note that tags must be included in the push command. When you push, you need to add ``to push a specific tag or `--tags` to push all tags. +To remove a tag, use `git tag -d ` to delete a specific tag, but you also need to delete it manually on github. ## Branches A branch is an independent timeline that roots from the main timeline. You can use it to work independently on same project, to experiment without risk, etc. From 29275253023fae928764fa9bad4f411fab81b7f3 Mon Sep 17 00:00:00 2001 From: rabuono Date: Tue, 25 Mar 2025 16:04:16 +0100 Subject: [PATCH 18/40] add GitHub release information in git_concepts.md --- git_and_github_concepts/git_concepts.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/git_and_github_concepts/git_concepts.md b/git_and_github_concepts/git_concepts.md index 75166ea..16994b9 100644 --- a/git_and_github_concepts/git_concepts.md +++ b/git_and_github_concepts/git_concepts.md @@ -68,7 +68,9 @@ GIT WORKFLOW: Git allows to create tags to mark specific points in the timeline of your repository. Tags can be used to specify specific versions of the code in a project. They can also be used to denote significant milestones in the development process. You can use `git tag ` to add a tag to a commit in your timeline. It is important to note that tags must be included in the push command. When you push, you need to add ``to push a specific tag or `--tags` to push all tags. -To remove a tag, use `git tag -d ` to delete a specific tag, but you also need to delete it manually on github. +To remove a tag, use `git tag -d ` to delete a specific tag, but you also need to delete it manually on github. + +**A note on releases:** Releases are a GitHub feature. They work on top of the tags feature and provide a way of packaging and distributing specific versions of the project. In addition to including release notes, releases can also have downloadable assets, like software source code. ## Branches A branch is an independent timeline that roots from the main timeline. You can use it to work independently on same project, to experiment without risk, etc. From 55c67a2258c46d8c44357519a97ffbe6123074c4 Mon Sep 17 00:00:00 2001 From: rabuono Date: Tue, 25 Mar 2025 16:20:11 +0100 Subject: [PATCH 19/40] add clarification on pull requests in git_concepts.md --- git_and_github_concepts/git_concepts.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git_and_github_concepts/git_concepts.md b/git_and_github_concepts/git_concepts.md index 16994b9..5d688bc 100644 --- a/git_and_github_concepts/git_concepts.md +++ b/git_and_github_concepts/git_concepts.md @@ -58,8 +58,8 @@ GIT WORKFLOW: **Conflicts:** If you are working with someone simultaneously and somebody pushes it before you, this will create a conflict, because Git cannot automatically merge changes. When you try to push your modifications, you will get an error. You need to manually resolve conflicts by editing the conflicting files. For this, you first need to pull the latest version (containing the commit of your collaborator), then you can modify the file and look at the conflict closely and resolve. After that, you need to git add, commit and push it again. -**Pull requests:** A pull request is a way to propose changes to a repository and facilitate collaborations. You create a pull request when you want to merge changes from one branch into another, and you need someone to review and approve them before merging. - 1. Push your changes to github +**Pull requests:** A pull request is a way to propose changes to a repository and facilitate collaborations. While a request for a pull exists as a git concept, the formalized pull request is a feature of web-based git hosting services like GitHub. You create a pull request when you want to merge changes from one branch into another, and you need someone to review and approve them before merging. + 1. Push your changes to GitHub 2. Open GitHub and navigate to your repository 3. Click the "Pull Requests" tab and create a new pull request, selecting your feature branch and the main branch 4. Once reviewed, the pull request can be merged. From 37f65196e5a1e3f3d6fa5ff46154760283f72868 Mon Sep 17 00:00:00 2001 From: rabuono Date: Tue, 25 Mar 2025 16:24:41 +0100 Subject: [PATCH 20/40] add git fetch and clarify git push in git_concepts.md --- git_and_github_concepts/git_concepts.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/git_and_github_concepts/git_concepts.md b/git_and_github_concepts/git_concepts.md index 5d688bc..31c0c6a 100644 --- a/git_and_github_concepts/git_concepts.md +++ b/git_and_github_concepts/git_concepts.md @@ -54,7 +54,9 @@ GIT WORKFLOW: ## Collaborations: **Adding collaborators:** You can grant other GitHub users access to your repository as collaborators, allowing them to push changes. -**Pulling changes:** pulling fetches changes from a remote repository and merges them into the current branch. +**Fetching changes:** Fetching changes from a remote repository downloads changes but does not apply them to your local branch. + +**Pulling changes:** Pulling changes from a remote repository downloads and merges them to your local branch. **Conflicts:** If you are working with someone simultaneously and somebody pushes it before you, this will create a conflict, because Git cannot automatically merge changes. When you try to push your modifications, you will get an error. You need to manually resolve conflicts by editing the conflicting files. For this, you first need to pull the latest version (containing the commit of your collaborator), then you can modify the file and look at the conflict closely and resolve. After that, you need to git add, commit and push it again. From 79d599f2130758d719262b37f80b19d41fb9474c Mon Sep 17 00:00:00 2001 From: rabuono Date: Tue, 25 Mar 2025 16:26:35 +0100 Subject: [PATCH 21/40] add a few initial git commands to git_cheat_sheet.md --- git_and_github_concepts/git_cheat_sheet.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/git_and_github_concepts/git_cheat_sheet.md b/git_and_github_concepts/git_cheat_sheet.md index 266af61..3d0d99f 100644 --- a/git_and_github_concepts/git_cheat_sheet.md +++ b/git_and_github_concepts/git_cheat_sheet.md @@ -1 +1,13 @@ -##This is a cheat sheet for git and github \ No newline at end of file +# This is a cheat sheet for git and github +## Git commands +`git init`: to initialize a repo + +`git add`: to add files to the staging area. See usage details for staging area in concepts_dictionary.md + +`git commit -m "meaningful message"`: to commit files from the staging area + +`git status`: to show current status + +`git log`: to see the log of all commits. Can be used with `-n #` where `#` is the number of commits in the past to show. `--abbrev-commits` will provide the abbreviated SHA for the commits. + +`git diff `: to show differences between commits. Where and are the SHA of the commits to be compared. First will be compared to second. \ No newline at end of file From e3df60f923529011525243a2464687f60dafb928 Mon Sep 17 00:00:00 2001 From: rabuono Date: Tue, 25 Mar 2025 17:32:43 +0100 Subject: [PATCH 22/40] typo fixes and add relative link to git concepts file in git_cheat_sheet.md --- git_and_github_concepts/git_cheat_sheet.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/git_and_github_concepts/git_cheat_sheet.md b/git_and_github_concepts/git_cheat_sheet.md index 3d0d99f..6dc2a31 100644 --- a/git_and_github_concepts/git_cheat_sheet.md +++ b/git_and_github_concepts/git_cheat_sheet.md @@ -1,13 +1,13 @@ # This is a cheat sheet for git and github ## Git commands -`git init`: to initialize a repo +`git init`: to initialize a repository. -`git add`: to add files to the staging area. See usage details for staging area in concepts_dictionary.md +`git add`: to add files to the staging area. See usage details for staging area in the [git concepts](/git_and_github_concepts/git_concepts.md) file. -`git commit -m "meaningful message"`: to commit files from the staging area +`git commit -m "meaningful message"`: to commit files from the staging area. -`git status`: to show current status +`git status`: to show current status. -`git log`: to see the log of all commits. Can be used with `-n #` where `#` is the number of commits in the past to show. `--abbrev-commits` will provide the abbreviated SHA for the commits. +`git log`: to see the log of all commits. Can be used with `-n #` where `#` is the number of commits in the past to show. `--abbrev-commits` will provide the abbreviated SHA for the commits. -`git diff `: to show differences between commits. Where and are the SHA of the commits to be compared. First will be compared to second. \ No newline at end of file +`git diff `: to show differences between commits. Where and are the SHA of the commits to be compared. First will be compared to second. \ No newline at end of file From 4021e6cae7c85bbb22c44ca1c253b4845cbe32ea Mon Sep 17 00:00:00 2001 From: rabuono Date: Tue, 25 Mar 2025 17:41:32 +0100 Subject: [PATCH 23/40] clarification and format fixes of GIT WORKFLOW in git_concepts.md --- git_and_github_concepts/git_concepts.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/git_and_github_concepts/git_concepts.md b/git_and_github_concepts/git_concepts.md index 31c0c6a..49b84dc 100644 --- a/git_and_github_concepts/git_concepts.md +++ b/git_and_github_concepts/git_concepts.md @@ -39,10 +39,12 @@ It is the remote repository. In the context of this course, we use GitHub. You f GIT WORKFLOW: 1. adjust your files and save (developing area) + 2. once you are ready, you should do: -`git add file_A`: send a copy of the file to the staging area -`git add *`: send a copy of all modified files to the staging area -3. commit changes: +`git add file_A`: records the changes made to file_A and adds it to the staging area +`git add *`: records the changes made to all files and adds it to the staging area + +3. commit changes: `git commit -m "message"`: you send from staging area to local commit, linked to a meaningful message. 4. push changes to remote repository: From 3d4e221784bf4ba010277f0f9dc7c605c8078116 Mon Sep 17 00:00:00 2001 From: rabuono Date: Tue, 25 Mar 2025 17:48:19 +0100 Subject: [PATCH 24/40] add note on the use of pull requests to merge branches in collaborative projects to git_concepts.md --- git_and_github_concepts/git_concepts.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git_and_github_concepts/git_concepts.md b/git_and_github_concepts/git_concepts.md index 49b84dc..073db9c 100644 --- a/git_and_github_concepts/git_concepts.md +++ b/git_and_github_concepts/git_concepts.md @@ -68,6 +68,8 @@ GIT WORKFLOW: 3. Click the "Pull Requests" tab and create a new pull request, selecting your feature branch and the main branch 4. Once reviewed, the pull request can be merged. +GitHub provides extensive documentation on pull requests in their [GitHub Docs platform](https://docs.github.com/en/pull-requests). + ## Tag a commit Git allows to create tags to mark specific points in the timeline of your repository. Tags can be used to specify specific versions of the code in a project. They can also be used to denote significant milestones in the development process. You can use `git tag ` to add a tag to a commit in your timeline. @@ -90,5 +92,6 @@ Once you’ve completed work on a branch, you can merge it back into the main br Once merged, you can delete the branch: `git branch -d ` - +**A note on direct merging and pull requests** +While you can directly merge a branch into your main branch, the commands described above do not include a review process. In collaborative projects that are hosted in web-platforms such as GitHub, the use of a pull request to bring code changes from a branch into the main branch of a project is advisable. Pull requests allow for collaborators to review and comment on changes, giving chance for useful feedback and code improvements. From 0e38b6f961a313d5a439f68c14627ae2b786351c Mon Sep 17 00:00:00 2001 From: saradufour Date: Tue, 25 Mar 2025 18:46:44 +0100 Subject: [PATCH 25/40] adding information to the markdown sheat cheet about ordered and unordered lists --- Markdown-concepts/Markdown_Sheat-cheet.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Markdown-concepts/Markdown_Sheat-cheet.md b/Markdown-concepts/Markdown_Sheat-cheet.md index f50509c..217cdff 100644 --- a/Markdown-concepts/Markdown_Sheat-cheet.md +++ b/Markdown-concepts/Markdown_Sheat-cheet.md @@ -10,4 +10,17 @@ **Bold text** (place text in between `** TEXT **`) -**Italic text** (place text in between `* TEXT *` or `_ TEXT _`) \ No newline at end of file +**Italic text** (place text in between `* TEXT *` or `_ TEXT _`) + +## lists + +### ordered lists +1. first list item +2. second list item +3. third list item + + +### Unordered lists +- A list item +- Another list item +- yet another list item \ No newline at end of file From 32aec53d3151bd2db0b2ae38734949919b7c74d0 Mon Sep 17 00:00:00 2001 From: saradufour Date: Tue, 25 Mar 2025 18:54:45 +0100 Subject: [PATCH 26/40] updating markdown sheat cheet with inserting links, documents and images --- Markdown-concepts/Markdown_Sheat-cheet.md | 22 +++++++++++++++++++++- documents/insetTextFileInMarkdown.txt | 0 images/InsertImageInMarkdown.png | Bin 0 -> 8515 bytes 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 documents/insetTextFileInMarkdown.txt create mode 100644 images/InsertImageInMarkdown.png diff --git a/Markdown-concepts/Markdown_Sheat-cheet.md b/Markdown-concepts/Markdown_Sheat-cheet.md index 217cdff..e86ff11 100644 --- a/Markdown-concepts/Markdown_Sheat-cheet.md +++ b/Markdown-concepts/Markdown_Sheat-cheet.md @@ -1,5 +1,7 @@ # Markdown cheat sheet +## General markdown information + # Header 1 `use # HEADER` ## Header 2 @@ -7,6 +9,8 @@ ### Header 3 `use ### HEADER` +`code` use `` to highlight code. + **Bold text** (place text in between `** TEXT **`) @@ -23,4 +27,20 @@ ### Unordered lists - A list item - Another list item -- yet another list item \ No newline at end of file +- yet another list item + +## links, documents and images +### links + +[visible url](https://google.com) +`[text](url)` + +### documents + +![alternative text when document is not there](../documents/insetTextFileInMarkdown.txt) +`![alt text](pathToFile)` + +### images + +![alternative text when image is not there](../images/InsertImageInMarkdown.png) +`![alt text](pathToFile)` \ No newline at end of file diff --git a/documents/insetTextFileInMarkdown.txt b/documents/insetTextFileInMarkdown.txt new file mode 100644 index 0000000..e69de29 diff --git a/images/InsertImageInMarkdown.png b/images/InsertImageInMarkdown.png new file mode 100644 index 0000000000000000000000000000000000000000..9e8035fb499f2b9afea010c9dd4e72b166703052 GIT binary patch literal 8515 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%0DSMVJZ2;R{F;YX|@q_tRrl>A*Rp696IloREj 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 literal 0 HcmV?d00001 From 161214a4b2e63c515f11e94afc89874199401ed1 Mon Sep 17 00:00:00 2001 From: leenput Date: Thu, 27 Mar 2025 09:16:23 +0100 Subject: [PATCH 27/40] Updated and structured the git_cheat_sheet.md file with config and git diff commands. Added git diff schematic in images folder. --- git_and_github_concepts/git_cheat_sheet.md | 43 ++++++++++++++++++--- images/git-diff-schematic.png | Bin 0 -> 35542 bytes 2 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 images/git-diff-schematic.png diff --git a/git_and_github_concepts/git_cheat_sheet.md b/git_and_github_concepts/git_cheat_sheet.md index 6dc2a31..3ea410d 100644 --- a/git_and_github_concepts/git_cheat_sheet.md +++ b/git_and_github_concepts/git_cheat_sheet.md @@ -1,13 +1,46 @@ # This is a cheat sheet for git and github -## Git commands -`git init`: to initialize a repository. + +## Setup +This commands are for configuring user information used across all local repositories: + +`git config --global user.name "[firstname lastname]"`: set a name that is identifiable for credit when review version history + +`git config --global user.email "[valid-email]"`: set an email adress that will be associated with each history marker + +`git config --global color.ui auto`: set automatic command line coloring for git for easy reviewing. + +## Git setup & init +Commands to config user information, initialization and cloning repositories. + +`git init`: to initialize an existing directory as a Git repository. + +`git clone [url]`: retrieve an entire remote repository via URL + +## Stage and snapshop +These are common commands used for working with snapshots and the Git staging area: + +`git status`: to show current status. Use it to show modified files in the working directory, staged for your next commit. `git add`: to add files to the staging area. See usage details for staging area in the [git concepts](/git_and_github_concepts/git_concepts.md) file. +`git reset [file]`: unstage a file while retaining the changes in your working directory + `git commit -m "meaningful message"`: to commit files from the staging area. -`git status`: to show current status. +## Inspect and compare +Commands to examine logs, diffs and object information + +`git log`: to see the log of all commits (for the currently active branch). Can be used with `-n #` where `#` is the number of commits in the past to show. `--abbrev-commits` will provide the abbreviated SHA for the commits. + +`git log branchA..branchB`: show the commits on branchA that are not on branchB. + +`git log --follow [file]`: show the commits that changed the specified file, even across renames + +`git diff`: to show the difference between changes in your working directory and staged area. + +`git diff --staged`: to show differences between staging area in all local files and the repository. If you add a filename, you will only see the staged changes in a certain file. Alternative: `git diff --cached` + +`git diff `: to show differences between commits. Where and are the SHA of the commits to be compared. First will be compared to second. -`git log`: to see the log of all commits. Can be used with `-n #` where `#` is the number of commits in the past to show. `--abbrev-commits` will provide the abbreviated SHA for the commits. +`git diff `: show differences between two branches. -`git diff `: to show differences between commits. Where and are the SHA of the commits to be compared. First will be compared to second. \ No newline at end of file diff --git a/images/git-diff-schematic.png b/images/git-diff-schematic.png new file mode 100644 index 0000000000000000000000000000000000000000..7e5c792fc07f9e37be70f82ed5f3f5dcdf791b1a GIT binary patch literal 35542 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 P1^AJZQkJZO8vFlWbTWm+ literal 0 HcmV?d00001 From c6d2666ae4009d872a618d05a75491d9144425d4 Mon Sep 17 00:00:00 2001 From: leenput Date: Thu, 27 Mar 2025 09:33:27 +0100 Subject: [PATCH 28/40] Included a reference.md file to provide an overview of useful weblinks that were consulted for this project. --- images/github_logo.png:Zone.Identifier | 0 references.md | 11 +++++++++++ 2 files changed, 11 insertions(+) delete mode 100644 images/github_logo.png:Zone.Identifier create mode 100644 references.md diff --git a/images/github_logo.png:Zone.Identifier b/images/github_logo.png:Zone.Identifier deleted file mode 100644 index e69de29..0000000 diff --git a/references.md b/references.md new file mode 100644 index 0000000..2d905bd --- /dev/null +++ b/references.md @@ -0,0 +1,11 @@ +# This file gives an overview of the references used in this project. + +## Git and Github concepts and cheat sheet: +- Training material: [website](https://github.com/vibbits/introduction-github) +- [website](https://education.github.com/git-cheat-sheet-education.pdf) +- [website](https://medium.com/@ramadan123sayed/a-comprehensive-guide-to-git-and-github-from-beginner-to-advanced-with-practical-use-cases-8e1ad98b48db) + +## Images: +- **git and github logo**: [website](https://pngimg.com/d/github_PNG65.png) +- **git diff schematic**: [website](https://lafkblogs.wordpress.com/2015/12/08/why-git-diff-shows-nothing/) + From 45230a8ff39b2a7993cf6645a3838beef2d34bf0 Mon Sep 17 00:00:00 2001 From: leenput Date: Thu, 27 Mar 2025 09:43:25 +0100 Subject: [PATCH 29/40] Creating a test_revert.md file to test git revert command --- git_and_github_concepts/test_revert.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 git_and_github_concepts/test_revert.md diff --git a/git_and_github_concepts/test_revert.md b/git_and_github_concepts/test_revert.md new file mode 100644 index 0000000..0ee6358 --- /dev/null +++ b/git_and_github_concepts/test_revert.md @@ -0,0 +1 @@ +This file is to test out the git revert command. From d836c2ece7e483487caa8d484e5df4f36396bc4d Mon Sep 17 00:00:00 2001 From: leenput Date: Thu, 27 Mar 2025 09:44:13 +0100 Subject: [PATCH 30/40] Revert "Creating a test_revert.md file to test git revert command" This reverts commit 45230a8ff39b2a7993cf6645a3838beef2d34bf0. Reverting the creating of the test_revert.md file. --- git_and_github_concepts/test_revert.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 git_and_github_concepts/test_revert.md diff --git a/git_and_github_concepts/test_revert.md b/git_and_github_concepts/test_revert.md deleted file mode 100644 index 0ee6358..0000000 --- a/git_and_github_concepts/test_revert.md +++ /dev/null @@ -1 +0,0 @@ -This file is to test out the git revert command. From 7978b712ed3f0484c928f3054603109136d932bf Mon Sep 17 00:00:00 2001 From: leenput Date: Thu, 27 Mar 2025 10:10:51 +0100 Subject: [PATCH 31/40] Updated references.md, git_cheat_sheet.md with information on branches, path changes, revert/reset and tagging --- git_and_github_concepts/git_cheat_sheet.md | 56 +++++++++++++++++++++- references.md | 11 +++-- 2 files changed, 61 insertions(+), 6 deletions(-) diff --git a/git_and_github_concepts/git_cheat_sheet.md b/git_and_github_concepts/git_cheat_sheet.md index 3ea410d..96c6200 100644 --- a/git_and_github_concepts/git_cheat_sheet.md +++ b/git_and_github_concepts/git_cheat_sheet.md @@ -16,7 +16,7 @@ Commands to config user information, initialization and cloning repositories. `git clone [url]`: retrieve an entire remote repository via URL -## Stage and snapshop +## Stage and snapshot These are common commands used for working with snapshots and the Git staging area: `git status`: to show current status. Use it to show modified files in the working directory, staged for your next commit. @@ -27,6 +27,15 @@ These are common commands used for working with snapshots and the Git staging ar `git commit -m "meaningful message"`: to commit files from the staging area. +## Branch and merge +Commands to isolate work in branches, change context and integrate changes + +`git branch `: create a new branch at the current commit + +`git checkout `: switch to another branch + +`git merge `: merge the specified branch's history into the current one. + ## Inspect and compare Commands to examine logs, diffs and object information @@ -44,3 +53,48 @@ Commands to examine logs, diffs and object information `git diff `: show differences between two branches. +`git show [SHA]`: show any object in Git in human-readable format. + +## Tracking path changes +Commands to version file removes and path changes + +`git rm [file]`: delete the file from project and stage the removal of the commit + +`git mv [existing-path] [new-path]`: change an existing file path and stage the move + +`git log --stat -M`: show all commit logs with indication of any paths that were moved. + +## Redo commits +Commands to erase mistakes and craft replacement history + +`git revert [commit SHA]`: create a new commit, reverting changes from the specified commit. It generates an inversion of changes (safest option) + +------ more dangerous option: + +`git reset [commit]`: Undoes all commits after [commit], preserving changes locally. It switches the current branch to the target commit, leaving a difference as an uncommited change. + +`git reset --hard [commit]`: Discards all history and changes back to the specified command. + +**CAUTION**: changing history can have nasty side effects. If you need to change commits that exist on GitHub, proceed with caution. + + +## Share and update +Commands to retrieve updates from another repository and updating local repository + +`git remove add [alias] [url]`: add a git URL as an alias + +`git fetch [alias]`: fetch down all the branches from that Git remote. It downloads all history from the remote tracking branches. + +`git merge [alias]/[branch]`: merge a remote branch into your current local branch to bring it up to date. + +`git push [alias] [branch]`: transmit local branch commits to the remote repository branch. + +`git pull`: Updates your current local working branch with all new commits from the corresponding remote branch on GitHub. It is a combination of git fetch and git merge. + +## Tagging commits + +`git tag`: list all tags + +`git tag [name] [commit SHA]`: create a tag reference named 'name' for current commit. Add commit SHA to tag a specific commit instead of current one. + +`git tag -d [name]`: remove a tag from local repository. \ No newline at end of file diff --git a/references.md b/references.md index 2d905bd..3c2aa4a 100644 --- a/references.md +++ b/references.md @@ -1,11 +1,12 @@ # This file gives an overview of the references used in this project. ## Git and Github concepts and cheat sheet: -- Training material: [website](https://github.com/vibbits/introduction-github) -- [website](https://education.github.com/git-cheat-sheet-education.pdf) -- [website](https://medium.com/@ramadan123sayed/a-comprehensive-guide-to-git-and-github-from-beginner-to-advanced-with-practical-use-cases-8e1ad98b48db) +- Training material: [VIB training_material](https://github.com/vibbits/introduction-github) +- [Education github cheat sheet](https://education.github.com/git-cheat-sheet-education.pdf) +- [Medium git and github guide](https://medium.com/@ramadan123sayed/a-comprehensive-guide-to-git-and-github-from-beginner-to-advanced-with-practical-use-cases-8e1ad98b48db) +- [Git lab Cheat Sheet](https://about.gitlab.com/images/press/git-cheat-sheet.pdf) ## Images: -- **git and github logo**: [website](https://pngimg.com/d/github_PNG65.png) -- **git diff schematic**: [website](https://lafkblogs.wordpress.com/2015/12/08/why-git-diff-shows-nothing/) +- [git and github logo](https://pngimg.com/d/github_PNG65.png) +- [git diff schematic](https://lafkblogs.wordpress.com/2015/12/08/why-git-diff-shows-nothing/) From d342b13fc5d2896d4626d49fce99bf00b5db132e Mon Sep 17 00:00:00 2001 From: saradufour Date: Thu, 27 Mar 2025 10:46:50 +0100 Subject: [PATCH 32/40] Revert "updating markdown sheat cheet with inserting links, documents and images" This reverts commit 32aec53d3151bd2db0b2ae38734949919b7c74d0. A mistake was made in the documentation of the markdown sheat cheet. --- Markdown-concepts/Markdown_Sheat-cheet.md | 22 +--------------------- documents/insetTextFileInMarkdown.txt | 0 images/InsertImageInMarkdown.png | Bin 8515 -> 0 bytes 3 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 documents/insetTextFileInMarkdown.txt delete mode 100644 images/InsertImageInMarkdown.png diff --git a/Markdown-concepts/Markdown_Sheat-cheet.md b/Markdown-concepts/Markdown_Sheat-cheet.md index e86ff11..217cdff 100644 --- a/Markdown-concepts/Markdown_Sheat-cheet.md +++ b/Markdown-concepts/Markdown_Sheat-cheet.md @@ -1,7 +1,5 @@ # Markdown cheat sheet -## General markdown information - # Header 1 `use # HEADER` ## Header 2 @@ -9,8 +7,6 @@ ### Header 3 `use ### HEADER` -`code` use `` to highlight code. - **Bold text** (place text in between `** TEXT **`) @@ -27,20 +23,4 @@ ### Unordered lists - A list item - Another list item -- yet another list item - -## links, documents and images -### links - -[visible url](https://google.com) -`[text](url)` - -### documents - -![alternative text when document is not there](../documents/insetTextFileInMarkdown.txt) -`![alt text](pathToFile)` - -### images - -![alternative text when image is not there](../images/InsertImageInMarkdown.png) -`![alt text](pathToFile)` \ No newline at end of file +- yet another list item \ No newline at end of file diff --git a/documents/insetTextFileInMarkdown.txt b/documents/insetTextFileInMarkdown.txt deleted file mode 100644 index e69de29..0000000 diff --git a/images/InsertImageInMarkdown.png b/images/InsertImageInMarkdown.png deleted file mode 100644 index 9e8035fb499f2b9afea010c9dd4e72b166703052..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8515 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%0DSMVJZ2;R{F;YX|@q_tRrl>A*Rp696IloREj zU8k>?alL`x2}6OM`;NOZBaV%zRdI8k38G=z2u&C^rWOoe7urA%pAFTh+dFH}>A4HrsMz&E8L<_+_}`6pe15m> zj1r!EV}Irh54AiYlxr93mriT!Bp}1m{cvoYk77HlBUp2*PIK)4C zp!5QZuO9%FkEeY@lQA}D*=%To7i=%5Cl800>*Yme(KcG)G%Bd~9&Yk_@Aqdw1^F12q%V}&@$*a^8gFhSkYlBZoH4vBvJ&>q(j`*)r;kV@9Hw4q>G)pjL z&J)98SZ|u*v7TRvlDymE#?N)D0t{>8Kdtj1a9Pk6RCf9V1hke;R~7~MS9H{HyyMiB zP2Z>ITTtNJ+p}59O8N2>BA>tTq7Xy==>)ZJJvcJ4+*Gy)m~<;tW`p1z3LOWf5by}; zV>_NigD-+QW0EC&hsS)`MkuN|;*Y1409nv*wY?CxKF)#4W!`0Xla-x)$EL^ewW+&B zsG(l{fKN=Ta0@ntc^fFL=i0)9F(3C%X6o_vPJ+B?6@Jqa>Fygk?0n`evfSurRaG(g6LSFeTXl*8T}lnZ}I!et(5|0U6zX zsw2H2o(j?H8CQ( zTzWe>R|C7&Wzbe0obfCiEIswXWwQxsMn&`URVV13R4*{{X34q`uBSnNF&Qe@NzoE` zzm1O+HcNFr#U`iz{6;GoHFsv>w&HJou7faTSX{9K9JO zVS$F4Y;iHq_(2lwjp%(bt?Fx!iagnjxay60@93zO1Ivz z$*!t9Lqke}#HBW=LnWPcZ*AJHMtP>^ZpR|qdnEIpC0WXzTk7rRX4Y`F3B3M0$<#_) zwWHdW-ZlQi#9Z(c+fG*jYxm2V%Jq193f=R*PnOU>p{!6^@wiacpD$^-PS|nuyC>$6 zA@-a{qYM;fi7i1jLSdrLJT#c2ocR$Ne1czFcIG^fB_iRkhvbH@<2bIa>w}i)dX|5R z6`l-h@3ib?GXz;4Q1)jpH|Ci+7J_d-QrOv(AB0vVwuE#a>8X*xM)$j2a8AzNT zk4Fi)0;9{;VA`L>cb2Nd%|u6`Kw)Tv>sR(%)Ck1Eum+@CxvE9fM@%h%qz zG14uLt5&vo0QCS)mnm;F-cW9KQi}K1G{2!Js)^6I;^Fx%;!?>rydm4Yn{+p3xh`*! zBui_j;%&b8uH)IybCyB!8k%3NJHxzzOKglSXF78!KXFr-@u})`_@AX@o>gLW)UF_q z-g?1>VCfcGo9mZl5~*SmUz4kJq{3U<{v$r+ew|LxEF5qIO>YCg)aRTq=&JhhBGRb! zSx#aXUFvjy0&LtHs=?UstxiXn4NO=4;zh2sLQQnl*>lKi|0y(&QnBk zJtAQ&+RYGe&l;rI`8u7toI%1mJHJD(E~r-Q=}Y-Wv(^`Cp3S^XwO!4%T1~y1gf>g*MKG?4YJPv8 zTtAB&ju+yX^TD(o0Eak}-bX#YkEpRQcT*QrM!aHg1QO+M7M|rIv zSHj|nWYb?;Ip75^#+)w3S*ga1Ru-*>shOquNshqlo`BuXHITm@&^1Fxx^IA5^}82e z&>iKo15Pk{uWxXS&)S?it0GqTiRk+i^msY40NvA@!MXX%-2R+@g3!VA72={Q1T z!|&EExKsTpvju|Xp{tUxQKKg{?TfBcbELUlxY{F;LlaZ+OZoBKyk|tTV!SBd3E2F^ z0a8WIm6 zvw#zY_m9;{8K;%A2+$CWNi-&ruf6}0FEyu5{)gCaf?G(~@aw*7BOs+2`o!Oak49^L zXDrH|kv=I=*G1|&F`c{+$0`DP(+v;sUmj(RVVAZ2Tb+L}kHx>{|3-8;CafD5o4+DL z1;>Il*$c!EmY?L@7=IYJlFD1jT`yxTLpi%zeh6h|>g!mk-~f%GTzVX}vQFj1-8v;Q zf7^F`2y`U}gi^BCSS6kc)|D)P~K&Oa}W*q&o&8-;u-h#t$decO+NlZ?M+m;CuY`M4D)g8fjJ zm(U&%z!~xZY=xjBgd?x&Zun2e!y9a8Uegd2FU56!=U&X+4L+V@FBKSsGvw@E1X8!S zzLW~29Gwg|GBNlz^2iK_*r7I(;bMjm(Voxzg2&6RIB+}e{v?oP1RDy#XGK+7#M2CtU&f-BMZ_DweSwK08<1cXVN z*dqfEU!U_PtEAe@?Ix)cZP#^)n5n`FO=Q>n{k%|9yz3)e&dd8DVd78JFvcNKp`t(v z|5;SFtIWs72^%TC8~t?W;*8n5v5X%S7bZ+{%3e_2s*v>Q8@TC1W5GJtJbc_Oo^qH7 zpid2`30I}^Ss%DGZD|lAdcfv7M<498Paa8|7Zb5-JufA+o101G!RL=iGWp!ajwmm# zFiHsL_$r=&tE1H7F%uDA+n{SJ^U?Hv@Kn2@P_r+};$bFy!fh#N?zP*i1IHIrhgI@e zIidRdc=1tG@X*+}%4$MmxI^COH@t5KKu6^a0*b0shRI!GaKrkAaQGKiGoYL?ePhiF z&fx@41ACi~+e`0LQ3@yIV=bAyp z@s|EHELNHA6SI1ZxIXhc#(AOMv034hCAI!j9Qun~Qn30LcdsLXTqeu2?jT1Xn+=fC zqDuWSz}LFJj}(!>$*{8$CEuM-!L2f8vh5djQ= zt9zzPT2%3)h`#o1dL&$lTE*5<^}Ah}w>Zg2ZRHX4+z*Vi;Wu~-UaEeUM5OyHKzj02 zSh%`W58XU!Zpbz^6`(6}L38h)B`L41e7@hofvBi3tIFZ=F_$zZ8_hQ5FB->v+YPxh zZ9t{lccybYfuY9@=1;%c-JejiElAjzXNOtA4Kl*VERGPIQtDH+6%KG>%9!UbZxPHQ zUwbE#tc-NfTX_Vh>aA+)jtpT&)~qQ3A;d^Ovq_b$~BLdec`&3z35^|WVyW96iRTn%L* zR6jMAm`HdRBy?I}kx6`7K7{{#;LIfJ)j2v?z^dX69{hZz-^=o>%gvbd- zF7UI}ft*WIVBy2*s|<@Ht@FxsbMW|vSrL*=&OaY<^J-j#5#g736*KxWZ>aN~h%*14 zW$8%ijvJSJu6*{cub3KnwHuHsd2msP)o0Ksl;Vfx$VZB)&fO-$7Fjc3eq1HdQ7yRH znbYI!+~axq@f1IZjCOVpL^Ady#=1u9lPw)RT%gn;7YyY7;LAvb=OSSi)k;*`A9^*0 zvZ>?R5>}C)Mdyj#!2DM}E;EQ6G!Q&O7k&&AO%&ry`uK23is`6iw!uV5+UqJYNFDV`*;{FouiUZ;T!Sw;RAVn|VM From be19bb6db958bcf87cf8214760dc359b49e7845e Mon Sep 17 00:00:00 2001 From: saradufour Date: Thu, 27 Mar 2025 10:52:23 +0100 Subject: [PATCH 33/40] updating markdown_sheat-cheet with correct information on links and images after revert --- Markdown-concepts/Markdown_Sheat-cheet.md | 13 ++++++++++++- images/ImageInMarkdown.png | Bin 0 -> 8515 bytes 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 images/ImageInMarkdown.png diff --git a/Markdown-concepts/Markdown_Sheat-cheet.md b/Markdown-concepts/Markdown_Sheat-cheet.md index 217cdff..662db0a 100644 --- a/Markdown-concepts/Markdown_Sheat-cheet.md +++ b/Markdown-concepts/Markdown_Sheat-cheet.md @@ -23,4 +23,15 @@ ### Unordered lists - A list item - Another list item -- yet another list item \ No newline at end of file +- yet another list item + + +## links and images + +### Links +[Visible URL](https://www.google.com) + +### Images +![Alternative text when image is not there](../images/ImageInMarkdown.png) + +`![Alternative text](pathToFile)` diff --git a/images/ImageInMarkdown.png b/images/ImageInMarkdown.png new file mode 100644 index 0000000000000000000000000000000000000000..5f7beefcba3f0a19efe543e7f1ec949ecf289abd GIT binary patch literal 8515 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 literal 0 HcmV?d00001 From 529ecb8985ca5be2b3d70f9e975d9f5dd7e5a4e2 Mon Sep 17 00:00:00 2001 From: rabuono Date: Thu, 27 Mar 2025 10:52:24 +0100 Subject: [PATCH 34/40] start references file and add two references --- references.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 references.md diff --git a/references.md b/references.md new file mode 100644 index 0000000..f81820c --- /dev/null +++ b/references.md @@ -0,0 +1,5 @@ +# References +Links to sources used for the files in this project + +- [GitHub documentation portal](https://docs.github.com/en) +- [Git cheat sheet from GitHub Education](https://education.github.com/git-cheat-sheet-education.pdf) \ No newline at end of file From eeaf148d42e8b2a595c5d05c7e71a8de9fcef891 Mon Sep 17 00:00:00 2001 From: saradufour Date: Thu, 27 Mar 2025 11:05:58 +0100 Subject: [PATCH 35/40] adding collaboration strategy to the README.md --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index c500b77..8c4f6d5 100644 --- a/README.md +++ b/README.md @@ -47,3 +47,10 @@ Once with the final version you must make a pull ------------------------------------------------------------------------------------------------- This project is part the first evaluation of the micro-credetial that is offered by [VIB](https://vib.be/en#/) and [UGent](https://www.ugent.be/en) with the aim to improve data analysis reproducbility in science. A micro-credential is like a mini-diploma that you have followed a course and learnd a new skill that is valuable for your carrear. If you are interested to register you can find more detais in the [UGent registration page](https://studiekiezer.ugent.be/2025/micro-credential-reproducible-data-analysis-an-essential-capability-in-modern-science-en). + + +collaboration strategy: +1. every collaborator creates a separate branch (leena, rafael, sara, main) +2. Leena works on git concepts, Rafael on github concepts, Sara on Markdown concepts +3. We communicate via Teams to update each other on the process and conflict creation/resolving. +4. second meeting on Thursday 27th at 2PM \ No newline at end of file From b277538c64e84bf855a9a96f73a258b009af8855 Mon Sep 17 00:00:00 2001 From: saradufour Date: Thu, 27 Mar 2025 11:22:27 +0100 Subject: [PATCH 36/40] adding markdown reference --- references.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/references.md b/references.md index 3c2aa4a..5747b97 100644 --- a/references.md +++ b/references.md @@ -10,3 +10,5 @@ - [git and github logo](https://pngimg.com/d/github_PNG65.png) - [git diff schematic](https://lafkblogs.wordpress.com/2015/12/08/why-git-diff-shows-nothing/) +## Markdown: +- [Markdown cheat sheet](https://www.markdownguide.org/cheat-sheet/) From c50e20b58d2057fa7e65300084fefc7bb98b71ce Mon Sep 17 00:00:00 2001 From: saradufour Date: Thu, 27 Mar 2025 11:24:45 +0100 Subject: [PATCH 37/40] adding markdown reference, forced to create conflict with sara_conflict branch --- references.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/references.md b/references.md index 3c2aa4a..f3717b0 100644 --- a/references.md +++ b/references.md @@ -10,3 +10,5 @@ - [git and github logo](https://pngimg.com/d/github_PNG65.png) - [git diff schematic](https://lafkblogs.wordpress.com/2015/12/08/why-git-diff-shows-nothing/) +## Markdown +-[Markdown cheat sheet](https://www.markdownguide.org/cheat-sheet/) \ No newline at end of file From 404435108219d2182a634ec2a39199ec025a2258 Mon Sep 17 00:00:00 2001 From: saradufour Date: Thu, 27 Mar 2025 11:32:50 +0100 Subject: [PATCH 38/40] fixed typo in reference.md --- references.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/references.md b/references.md index b409eb8..788634c 100644 --- a/references.md +++ b/references.md @@ -11,5 +11,5 @@ - [git diff schematic](https://lafkblogs.wordpress.com/2015/12/08/why-git-diff-shows-nothing/) ## Markdown --[Markdown cheat sheet](https://www.markdownguide.org/cheat-sheet/) +- [Markdown cheat sheet](https://www.markdownguide.org/cheat-sheet/) From 5f97d4e6ea478c936ba09b31e9753b902276bf00 Mon Sep 17 00:00:00 2001 From: rabuono Date: Fri, 28 Mar 2025 14:50:58 +0100 Subject: [PATCH 39/40] adding a new link to meet review requirements --- references.md | 1 + 1 file changed, 1 insertion(+) diff --git a/references.md b/references.md index 33546ff..b00d745 100644 --- a/references.md +++ b/references.md @@ -7,6 +7,7 @@ - [Git lab Cheat Sheet](https://about.gitlab.com/images/press/git-cheat-sheet.pdf) - [GitHub documentation portal](https://docs.github.com/en) - [Git cheat sheet from GitHub Education](https://education.github.com/git-cheat-sheet-education.pdf) +- [GitHub Education](https://github.com/education) ## Images: - [git and github logo](https://pngimg.com/d/github_PNG65.png) From 7ccf111f6c4f5845d00b63b8bbcbd4ac787b764d Mon Sep 17 00:00:00 2001 From: leenput Date: Fri, 28 Mar 2025 14:58:04 +0100 Subject: [PATCH 40/40] Removed double reference from references.md file --- references.md | 1 - 1 file changed, 1 deletion(-) diff --git a/references.md b/references.md index b00d745..ae7cbd0 100644 --- a/references.md +++ b/references.md @@ -2,7 +2,6 @@ ## Git and Github concepts and cheat sheet: - Training material: [VIB training_material](https://github.com/vibbits/introduction-github) -- [Education github cheat sheet](https://education.github.com/git-cheat-sheet-education.pdf) - [Medium git and github guide](https://medium.com/@ramadan123sayed/a-comprehensive-guide-to-git-and-github-from-beginner-to-advanced-with-practical-use-cases-8e1ad98b48db) - [Git lab Cheat Sheet](https://about.gitlab.com/images/press/git-cheat-sheet.pdf) - [GitHub documentation portal](https://docs.github.com/en)