From b94bb57886b7aa3b223fec8dd0a36205a6b916f7 Mon Sep 17 00:00:00 2001 From: Sylvain Gouttebroze Date: Mon, 26 Apr 2021 09:17:26 +0200 Subject: [PATCH 1/5] doc on git commands --- doc/branching diagram.png | Bin 0 -> 41612 bytes doc/git commands.md | 104 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+) create mode 100644 doc/branching diagram.png create mode 100644 doc/git commands.md diff --git a/doc/branching diagram.png b/doc/branching diagram.png new file mode 100644 index 0000000000000000000000000000000000000000..b316a98f720f9c92f61b7ba6e4aa9946058d61b6 GIT binary patch literal 41612 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℘> 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 literal 0 HcmV?d00001 diff --git a/doc/git commands.md b/doc/git commands.md new file mode 100644 index 0000000..55d9c34 --- /dev/null +++ b/doc/git commands.md @@ -0,0 +1,104 @@ +Guidelines to develop the ontology with Git and Github +========================================================== + +## Settings up your account on Github + +### Create an account + +### Add a public ssh key + +## Installing Git on your computer + +https://git-scm.com/downloads + + +## Interacting with the repository remotely + +In our collaborative work, we aim at developing the ontology in parallel. +Each participant has a local repository to make its development. The local +developments are then pushed to the remote repository to be available for all the partners. + +The main operations are described in the following sections. + +### Clone the repository + +The current version is available on GitHub so we want to copy that repository locally +to make our changes. +We will ***clone the repository*** with the following command line: +``` +git clone git@github.com:emmo-repo/domain-microstructure.git +``` + +This operation uses ssh protocols so you need to have stored your public ssh key in your profile. +It is possible to clone also with https but it is simpler with ssh. + +After that operation, you have the copy of the default branch (*main* in our case) +but also all the branches. + +### Transfer changes to the remote repository + +Git aims at tracking the changes between version. For that reason, when you have made +some changes two operations are needed: tagging and committing. Tagging will consist +in indicating which file is to be marked as changed (and so which changes will be recorded +in the repository). Committing will actually do the recording of the changes. + +Tagging is done by: ```git add name_of_file``` + +Commiting is done by: ```git commit -m "my description of the changes" ``` + +The command ```git status``` will give you an overview of the tracked files that +have been modified, the tagged files, and also of the files that are not tracked. +It also indicates on which branch you are. + +After the commit, your local repository has been updated. This update needs to +be transferred to the remote repository stored on GitHub. We need to push the changes +by: +```git push``` + +### Update your local repository + +```git fetch``` The git fetch command downloads commits from the remote repository +into your local repository to see the changes. + +```git pull``` The git pull command is used to fetch and download content from a remote repository +and immediately update the local repository to match that content. + +To avoid merging issues, it is important to pull from the remote repository before +adding new changes. + +### Branching + +Significant modifications on the code are usually done in branches. When the new feature of +the branch is developed, the branch can be merged with the main branch. + +

+ +The main commands are: + +```git branch ``` to get the list of branches. + +```git checkout name_of_branch ``` to change to an existing branch. + +```git checkout -b name_of_branch ``` to create a new branch and change to it. + +```git checkout -b name_of_branch ``` to create a new branch and change to it. + + +### Merging + +```git merge name_of_branch``` to merge the branch with your current branch. + +In case of conflicts between your changes and what has been changed since your latest +update from the remote repository, you will need to resolve the conflicts. +During merge, the files will be modified to contain both versions of the portions +of codes. You need then to select what to keep. + +More details are available here: +https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts + + + + + + + From c61af6156ffbfb44fb180abe20137fd73a92b8f1 Mon Sep 17 00:00:00 2001 From: Sylvain Gouttebroze Date: Mon, 26 Apr 2021 11:55:12 +0200 Subject: [PATCH 2/5] thesaurus --- doc/thesaurus.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 doc/thesaurus.md diff --git a/doc/thesaurus.md b/doc/thesaurus.md new file mode 100644 index 0000000..a2bd841 --- /dev/null +++ b/doc/thesaurus.md @@ -0,0 +1,19 @@ +Thesaurus of terms to include in Microstructure domain ontology +================================================================== + +# Microstructure + + +# REV + + + +# Grain + + + +# Grain boundary + + + + From 5dde9daa20b6e1abb5378308329a78ccb761c3ff Mon Sep 17 00:00:00 2001 From: Sylvain Gouttebroze <39990946+sygout@users.noreply.github.com> Date: Thu, 4 Jul 2024 10:19:33 +0200 Subject: [PATCH 3/5] Update doc/git commands.md Co-authored-by: Jesper Friis --- doc/git commands.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/git commands.md b/doc/git commands.md index 55d9c34..e7f257c 100644 --- a/doc/git commands.md +++ b/doc/git commands.md @@ -42,7 +42,7 @@ some changes two operations are needed: tagging and committing. Tagging will con in indicating which file is to be marked as changed (and so which changes will be recorded in the repository). Committing will actually do the recording of the changes. -Tagging is done by: ```git add name_of_file``` +Staging is done by: ```git add name_of_file``` Commiting is done by: ```git commit -m "my description of the changes" ``` From 7ca1c0363fa57713f156f68bb9d86706f03f8cc6 Mon Sep 17 00:00:00 2001 From: Sylvain Gouttebroze <39990946+sygout@users.noreply.github.com> Date: Thu, 4 Jul 2024 10:19:44 +0200 Subject: [PATCH 4/5] Update doc/git commands.md Co-authored-by: Jesper Friis --- doc/git commands.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/git commands.md b/doc/git commands.md index e7f257c..b9e35c4 100644 --- a/doc/git commands.md +++ b/doc/git commands.md @@ -47,7 +47,7 @@ Staging is done by: ```git add name_of_file``` Commiting is done by: ```git commit -m "my description of the changes" ``` The command ```git status``` will give you an overview of the tracked files that -have been modified, the tagged files, and also of the files that are not tracked. +have been modified, the staged files, and also of the files that are not tracked. It also indicates on which branch you are. After the commit, your local repository has been updated. This update needs to From bec51fd5b3af74331e0c365041a526f4453daaae Mon Sep 17 00:00:00 2001 From: Sylvain Gouttebroze <39990946+sygout@users.noreply.github.com> Date: Thu, 4 Jul 2024 10:19:57 +0200 Subject: [PATCH 5/5] Update doc/git commands.md Co-authored-by: Jesper Friis --- doc/git commands.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/git commands.md b/doc/git commands.md index b9e35c4..e7047b0 100644 --- a/doc/git commands.md +++ b/doc/git commands.md @@ -38,7 +38,7 @@ but also all the branches. ### Transfer changes to the remote repository Git aims at tracking the changes between version. For that reason, when you have made -some changes two operations are needed: tagging and committing. Tagging will consist +some changes two operations are needed: staging and committing. Staging will consist in indicating which file is to be marked as changed (and so which changes will be recorded in the repository). Committing will actually do the recording of the changes.