diff --git a/docs/pages/git/git-9-vscode.md b/docs/pages/git/git-9-vscode.md new file mode 100644 index 0000000000000000000000000000000000000000..ec8a4573c07debc98420cb9d615817409cb1bee8 --- /dev/null +++ b/docs/pages/git/git-9-vscode.md @@ -0,0 +1,113 @@ +# VSCode extensions + +## Install of Git VSCode extensions + +Click on the Extension button on the left (red box below): + + + +Install the following extensions: + + + + + + + + +# Cloning a repository + +## Closing windows + +First, close all the existing windows: + + + +The shortcut is `Ctrl K, F` + +## Cloning a repository + +Click on Git extension panel: + + + +Click on the `Clone Repository`. Enter the repository address. Add your credentials: + + + +## Git status + +To check the status of your Git repository, navigate on the different sections of the Git extension window. + + + + + +# Commit changes + +## Looking at changes + +Click on a file that you modified on the "Changes" list: + + + + + +The changes are displayed on the right panel. Le left panel shows file as it is in `HEAD`. + +## Stage (`git add`) + +To add the files to the index (`git add` command), click on the `+` button: + + + +## Commit (`git commit`) + +To commit the staged files (`git commit` command), fill the text box with a commit message and click on the `Commit` button. + + + +## Push (`git push`) + +To push the commited files to the remote repository (`git push` command), click on the `Sync Changes` button. + + + +## Pull (`git pull`) + +To pull a repository, click on the `...` button (in red below) and click on the `Pull` button. Enter your credentials (login and password). + + + +# Conflicts + +## Conflicts: warning message + +In case of a conflict, the following message will show up: + + + +The files in which there is a conflict will appear with a `!` symbol + + + +## Conflicts: manual merge + +To solve a conflict manually, click on the conflicted files. You will see: + + + +VSCode also provides a Merge Editor (button at the bottom right of conflicted files) + +## Conflicts: merge editor + +On the top-left, you will see the incoming version (from the remote). On top-right, the actual (local) one. Below, the merge result. There are buttons that allow to choose one version or merge both versions in any order. + + + + +## Solving conflicts + +When the conflict is solved, click on the `Complete Merge` button and push your changes as shown above + + diff --git a/docs/pages/git/images-vscode/change.png b/docs/pages/git/images-vscode/change.png new file mode 100644 index 0000000000000000000000000000000000000000..5f8a1d536156974fda7aaf550acb8c8fd8489025 Binary files /dev/null and b/docs/pages/git/images-vscode/change.png differ diff --git a/docs/pages/git/images-vscode/clone-repo.png b/docs/pages/git/images-vscode/clone-repo.png new file mode 100644 index 0000000000000000000000000000000000000000..89519139b16bd6a19cfdc85bdd9ccb1f9a6f786e Binary files /dev/null and b/docs/pages/git/images-vscode/clone-repo.png differ diff --git a/docs/pages/git/images-vscode/close-windows.png b/docs/pages/git/images-vscode/close-windows.png new file mode 100644 index 0000000000000000000000000000000000000000..929faa2a61e4e399920347203ef29797f39f999a Binary files /dev/null and b/docs/pages/git/images-vscode/close-windows.png differ diff --git a/docs/pages/git/images-vscode/commit.png b/docs/pages/git/images-vscode/commit.png new file mode 100644 index 0000000000000000000000000000000000000000..8784346ffb5672ddb7735b74c4eeb4be0fb5a904 Binary files /dev/null and b/docs/pages/git/images-vscode/commit.png differ diff --git a/docs/pages/git/images-vscode/conflict-console.png b/docs/pages/git/images-vscode/conflict-console.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a8b36253e14faba0e271a017eee93c9ef9ae5d Binary files /dev/null and b/docs/pages/git/images-vscode/conflict-console.png differ diff --git a/docs/pages/git/images-vscode/conflict-manual.png b/docs/pages/git/images-vscode/conflict-manual.png new file mode 100644 index 0000000000000000000000000000000000000000..85eb12a3c6f75b7f401e4a96a03560cb07b68693 Binary files /dev/null and b/docs/pages/git/images-vscode/conflict-manual.png differ diff --git a/docs/pages/git/images-vscode/conflict-message.png b/docs/pages/git/images-vscode/conflict-message.png new file mode 100644 index 0000000000000000000000000000000000000000..1441b247369d2dd187d8203f9120c0391ef954ef Binary files /dev/null and b/docs/pages/git/images-vscode/conflict-message.png differ diff --git a/docs/pages/git/images-vscode/conflict-solved.png b/docs/pages/git/images-vscode/conflict-solved.png new file mode 100644 index 0000000000000000000000000000000000000000..d9c12f4f41a5f66b1a9701bb56e94d37e94c766f Binary files /dev/null and b/docs/pages/git/images-vscode/conflict-solved.png differ diff --git a/docs/pages/git/images-vscode/extension.png b/docs/pages/git/images-vscode/extension.png new file mode 100644 index 0000000000000000000000000000000000000000..840e8227a56e77914a7090f71cb7e3c24b6a7696 Binary files /dev/null and b/docs/pages/git/images-vscode/extension.png differ diff --git a/docs/pages/git/images-vscode/fetch.png b/docs/pages/git/images-vscode/fetch.png new file mode 100644 index 0000000000000000000000000000000000000000..ff0e631425c2cce7286fa0392294ab7c44a5da51 Binary files /dev/null and b/docs/pages/git/images-vscode/fetch.png differ diff --git a/docs/pages/git/images-vscode/git-extension-pack.png b/docs/pages/git/images-vscode/git-extension-pack.png new file mode 100644 index 0000000000000000000000000000000000000000..d19dd2b91a41bd864d3724df2e8d8958a2df0e74 Binary files /dev/null and b/docs/pages/git/images-vscode/git-extension-pack.png differ diff --git a/docs/pages/git/images-vscode/git-flow.png b/docs/pages/git/images-vscode/git-flow.png new file mode 100644 index 0000000000000000000000000000000000000000..8b0a4240a3c075518ef29a653a6581ab9ba8c846 Binary files /dev/null and b/docs/pages/git/images-vscode/git-flow.png differ diff --git a/docs/pages/git/images-vscode/git-graph.png b/docs/pages/git/images-vscode/git-graph.png new file mode 100644 index 0000000000000000000000000000000000000000..9d0676edc1a3c738d5731a32b5f7aa4ee604e034 Binary files /dev/null and b/docs/pages/git/images-vscode/git-graph.png differ diff --git a/docs/pages/git/images-vscode/merge-message.png b/docs/pages/git/images-vscode/merge-message.png new file mode 100644 index 0000000000000000000000000000000000000000..3f2d29fc0bd87fb5300e8620224c79066c7c10ad Binary files /dev/null and b/docs/pages/git/images-vscode/merge-message.png differ diff --git a/docs/pages/git/images-vscode/panel-1.png b/docs/pages/git/images-vscode/panel-1.png new file mode 100644 index 0000000000000000000000000000000000000000..21133ef8c580b8550bd3b669ef0c9442ca4c1a60 Binary files /dev/null and b/docs/pages/git/images-vscode/panel-1.png differ diff --git a/docs/pages/git/images-vscode/panel-2.png b/docs/pages/git/images-vscode/panel-2.png new file mode 100644 index 0000000000000000000000000000000000000000..0862978ef9e5922579036efcb9e0fbcc24ecd0b1 Binary files /dev/null and b/docs/pages/git/images-vscode/panel-2.png differ diff --git a/docs/pages/git/images-vscode/pull.png b/docs/pages/git/images-vscode/pull.png new file mode 100644 index 0000000000000000000000000000000000000000..bce234047ec21daa1b30d8c451b6ad9a6be17a0d Binary files /dev/null and b/docs/pages/git/images-vscode/pull.png differ diff --git a/docs/pages/git/images-vscode/push.png b/docs/pages/git/images-vscode/push.png new file mode 100644 index 0000000000000000000000000000000000000000..b05cdf649a4efbeb60b24492bbfa51c8eca7ebc8 Binary files /dev/null and b/docs/pages/git/images-vscode/push.png differ diff --git a/docs/pages/git/images-vscode/source-1.png b/docs/pages/git/images-vscode/source-1.png new file mode 100644 index 0000000000000000000000000000000000000000..1f4f0728d468dfb5ec69a0940cee29dd29444737 Binary files /dev/null and b/docs/pages/git/images-vscode/source-1.png differ diff --git a/docs/pages/git/images-vscode/source-2.png b/docs/pages/git/images-vscode/source-2.png new file mode 100644 index 0000000000000000000000000000000000000000..31cb428f9f58262901aa451088979757fbf4cf39 Binary files /dev/null and b/docs/pages/git/images-vscode/source-2.png differ diff --git a/docs/pages/git/images-vscode/stage.png b/docs/pages/git/images-vscode/stage.png new file mode 100644 index 0000000000000000000000000000000000000000..71f2981f81d42d41f7418d3b6fa2237191bacd69 Binary files /dev/null and b/docs/pages/git/images-vscode/stage.png differ