diff --git a/02_gitlab_depot_distant/index.qmd b/02_gitlab_depot_distant/index.qmd index 518023bf895f0da732c877564adbe6f3354500ed..ceff44b94804dd7f6fb348f3ed1ff9adf7abeca5 100644 --- a/02_gitlab_depot_distant/index.qmd +++ b/02_gitlab_depot_distant/index.qmd @@ -15,6 +15,12 @@ format: editor: visual --- +::: callout-important +Attention, les captures d'écran faites sur Gitlab proviennent d'une ancienne version de la forgeMIA. Cela ne devrait pas impacter la compréhension et la bonne lecture des supports. + +Les supports seront mis à jour au moment du passage à la forge institutionnelle. +::: + <!--- Objectifs ---> {{< include 01_objectifs.qmd >}} diff --git a/03_branches/06_03_gestion_branche_local_vscode.qmd b/03_branches/06_03_gestion_branche_local_vscode.qmd index 49748e72f6723f663ede3fb687cb3359db280b6e..9c5f97269a6077febaa78b8db1cc6c0612a7ceee 100644 --- a/03_branches/06_03_gestion_branche_local_vscode.qmd +++ b/03_branches/06_03_gestion_branche_local_vscode.qmd @@ -33,7 +33,7 @@ gitGraph ``` --> -{width=80%} +{width=40%} ::: {.notes} Cela déplace HEAD pour le faire pointer vers la branche testing. @@ -76,7 +76,7 @@ gitGraph ``` --> - + ## Lister les branches diff --git a/03_branches/08_fusion_conflit_remisage.qmd b/03_branches/08_fusion_conflit_remisage.qmd index ce63a37afe528aa37d23c62d07e41c15f3b3bd25..3250688119d49baf5598c079cc646b8fba07246c 100644 --- a/03_branches/08_fusion_conflit_remisage.qmd +++ b/03_branches/08_fusion_conflit_remisage.qmd @@ -28,7 +28,7 @@ gitGraph ``` --> -{width=80%} +{width=50%} Fusion de hotfix sur main puis de issue-1 sur main diff --git a/03_branches/images/05-04_vscode_nvlle_branche.png b/03_branches/images/05-04_vscode_nvlle_branche.png index c4920ddbb154a8b87c5f12751278b7e5ab730da2..6a34110994a69f1194f77273354508be18949ffe 100644 Binary files a/03_branches/images/05-04_vscode_nvlle_branche.png and b/03_branches/images/05-04_vscode_nvlle_branche.png differ diff --git a/03_branches/images/mermaid_1.png b/03_branches/images/mermaid_1.png index 863dee64f5923cc11fa0de209fe2078b1f013dcb..46279edca23d0b9a6c4cdfeff1ad90ff5e2f2c4d 100644 Binary files a/03_branches/images/mermaid_1.png and b/03_branches/images/mermaid_1.png differ diff --git a/03_branches/images/mermaid_10.png b/03_branches/images/mermaid_10.png index 91e5d5507d284f0d36306389b2869394a8e20c6d..dc1b222beff2031881f95a6362751859e28faf43 100644 Binary files a/03_branches/images/mermaid_10.png and b/03_branches/images/mermaid_10.png differ diff --git a/03_branches/images/mermaid_11.png b/03_branches/images/mermaid_11.png index aee7347b4160d86887f7de4093bfe35595387fb5..93e09c6d29913f0189b79278df53bb1d6b898b68 100644 Binary files a/03_branches/images/mermaid_11.png and b/03_branches/images/mermaid_11.png differ diff --git a/03_branches/images/mermaid_12.png b/03_branches/images/mermaid_12.png index 2c6f372907946069bb1294e0a7b376091bee2ba7..532aa0ec752b40ed1001349c9b8ffc60fcfd4f74 100644 Binary files a/03_branches/images/mermaid_12.png and b/03_branches/images/mermaid_12.png differ diff --git a/03_branches/images/mermaid_2.png b/03_branches/images/mermaid_2.png index 57b840c91d9af9c59f8d1c34c81daea887766b58..7e154dba56822d94a466efc7a6736df5982dc9f6 100644 Binary files a/03_branches/images/mermaid_2.png and b/03_branches/images/mermaid_2.png differ diff --git a/03_branches/images/mermaid_3.png b/03_branches/images/mermaid_3.png index 99cb7d5c5b4cbb835bb417ea10e1079c85488815..93e09c6d29913f0189b79278df53bb1d6b898b68 100644 Binary files a/03_branches/images/mermaid_3.png and b/03_branches/images/mermaid_3.png differ diff --git a/03_branches/images/mermaid_4.png b/03_branches/images/mermaid_4.png index a99a7b2a0a24f30a140226e2b25db3c073a1cf0c..9c57cadee5b2b5f4fdb6bc2f4b8a885f738c4986 100644 Binary files a/03_branches/images/mermaid_4.png and b/03_branches/images/mermaid_4.png differ diff --git a/03_branches/images/mermaid_5.png b/03_branches/images/mermaid_5.png index c2cac8f3a854ed8e81f7dfcfd80fe6098e1b8973..0c9ff7959701f865cc490b5890240bf928d46bc3 100644 Binary files a/03_branches/images/mermaid_5.png and b/03_branches/images/mermaid_5.png differ diff --git a/03_branches/images/mermaid_6.png b/03_branches/images/mermaid_6.png index c26da1269da4bad584a4b7ecf05f9dc5747cacb4..a9825e25b34a48ddba31fa829c192ac22dfc04a6 100644 Binary files a/03_branches/images/mermaid_6.png and b/03_branches/images/mermaid_6.png differ diff --git a/03_branches/images/mermaid_7.png b/03_branches/images/mermaid_7.png index e5cba122a9bd78405a5d1df481b9aa1795db2c45..c7f797774892316a1142c6f802977700d03bce5a 100644 Binary files a/03_branches/images/mermaid_7.png and b/03_branches/images/mermaid_7.png differ diff --git a/03_branches/images/mermaid_8.png b/03_branches/images/mermaid_8.png deleted file mode 100644 index 343b8b38032da825c13500583ffb1ba542fc3f6f..0000000000000000000000000000000000000000 Binary files a/03_branches/images/mermaid_8.png and /dev/null differ diff --git a/03_branches/images/mermaid_9.png b/03_branches/images/mermaid_9.png deleted file mode 100644 index 0e219c0b60e7449bc6c70698eaf6a757c5a512b7..0000000000000000000000000000000000000000 Binary files a/03_branches/images/mermaid_9.png and /dev/null differ diff --git a/03_branches/index.qmd b/03_branches/index.qmd index 987cf2cecc4a620e6bf572f4d1af288d652d3006..9397ecb43ab3b3d4c000b6f8ddf5386b05c286c4 100644 --- a/03_branches/index.qmd +++ b/03_branches/index.qmd @@ -15,6 +15,12 @@ format: editor: visual --- +::: callout-important +Attention, les captures d'écran faites sur Gitlab proviennent d'une ancienne version de la forgeMIA. Cela ne devrait pas impacter la compréhension et la bonne lecture des supports. + +Les supports seront mis à jour au moment du passage à la forge institutionnelle. +::: + <!--- Objectifs ---> {{< include 01_objectifs.qmd >}} @@ -42,7 +48,6 @@ editor: visual {{< include 06_02_gestion_branche_local_ligne_commande.qmd >}} {{< include 06_03_gestion_branche_local_vscode.qmd >}} - <!-- Gestion des branches distantes --> {{< include 07_gestion_branches_distantes.qmd >}} @@ -68,4 +73,3 @@ editor: visual <!-- Prochaine session --> {{< include 12_prochaine_session.qmd >}} -