Résoudre ses conflits sur Git
Regarder tous les commit qui ont été réalisés
git log --oneline
97692T@PWVD4320 MINGW64 ~/Documents/Obsidian/simplon-2026 (21-obsidian-configuration)
$ git log --oneline
2a486db ⇒ numéro de commit où nous sommes
**2a486db** (HEAD -> 21-obsidian-configuration, origin/21-obsidian-configuration) correction exemp
938d400 correction exempl
0175857 correction exemple
fa197a7 translate file in french
6203420 ajout dossier 4. Obsidian
a1d8bc0 Doc: config
6ca1979 ⇒ numéro du commit où l’on veut revenir
**6ca1979** (origin/52-create-the-contributing-md, main) 9 homepage (#40)
4d5f004 Doc bonnes pratiques CSS (#31)
7800efd (origin/36-raccourcis-vscode, origin/24-installer-linux, origin/2-epic-langage-html) doc: initialisation vault obsidian
051cf58 vault backup: 2026-01-29 15:21:07
894a39d Initial commit
Se positionner sur le commit avant les modifications qu’on veut supprimer
git checkout 6ca1979
97692T@PWVD4320 MINGW64 ~/Documents/Obsidian/simplon-2026 (21-obsidian-configuration)
$ git checkout 6ca1979
Note: switching to '6ca1979'.
You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by switching back to a branch.
If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -c with the switch command. Example:
git switch -c <new-branch-name>
Or undo this operation with:
git switch -
Turn off this advice by setting config variable advice.detachedHead to false
HEAD is now at 6ca1979 9 homepage (#40)
Delete la branch sur laquelle on travaillait
git branch -d 21-obsidian-configuration
97692T@PWVD4320 MINGW64 ~/Documents/Obsidian/simplon-2026 ((6ca1979...))
$ git branch -d 21-obsidian-configuration
warning: deleting branch '21-obsidian-configuration' that has been merged to
'refs/remotes/origin/21-obsidian-configuration', but not yet merged to HEAD
Deleted branch 21-obsidian-configuration (was 2a486db).
Recréer une branch du même nom que la précédente
git checkout -b 21-obsidian-configuration
97692T@PWVD4320 MINGW64 ~/Documents/Obsidian/simplon-2026 ((6ca1979...))
$ git checkout -b 21-obsidian-configuration
Switched to a new branch '21-obsidian-configuration'
Vérification du positionnement du commit : 6ca1979
git log --oneline
97692T@PWVD4320 MINGW64 ~/Documents/Obsidian/simplon-2026 (21-obsidian-configuration)
$ git log --oneline
6ca1979 (HEAD -> 21-obsidian-configuration, origin/52-create-the-contributing-md, main) 9 homepage (#40)
4d5f004 Doc bonnes pratiques CSS (#31)
7800efd (origin/36-raccourcis-vscode, origin/24-installer-linux, origin/2-epic-langage-html) doc: initialisation vault obsidian
051cf58 vault backup: 2026-01-29 15:21:07
894a39d Initial commit
Récupération de tous les commit réduits en un seul commit (entre le tout premier et celui sur lequel on vient de se positionner)
git merge --squash 2a486db
97692T@PWVD4320 MINGW64 ~/Documents/Obsidian/simplon-2026 (21-obsidian-configuration)
$ git merge --squash 2a486db
Updating 6ca1979..2a486db
error: Your local changes to the following files would be overwritten by merge:
.obsidian/workspace.json
Please commit your changes or stash them before you merge.
Aborting
On retire le fichier en erreur
git checkout .obsidian/workspace.json
97692T@PWVD4320 MINGW64 ~/Documents/Obsidian/simplon-2026 (21-obsidian-configuration)
$ git checkout .obsidian/workspace.json
Updated 1 path from the index
On refait le merge qui n’a pas fonctionné auparavant à cause du workspace.json
git merge --squash 2a486db
97692T@PWVD4320 MINGW64 ~/Documents/Obsidian/simplon-2026 (21-obsidian-configuration)
$ git merge --squash 2a486db
Updating 6ca1979..2a486db
Fast-forward
Squash commit -- not updating HEAD
.obsidian/app.json | 4 -
.obsidian/appearance.json | 1 -
.obsidian/community-plugins.json | 7 -
.obsidian/core-plugins.json | 33 -
.obsidian/graph.json | 22 -
.obsidian/plugins/calendar/data.json | 10 -
.obsidian/plugins/calendar/main.js | 4459 --------------------
.obsidian/plugins/calendar/manifest.json | 10 -
.obsidian/plugins/homepage/main.js | 3 -
.obsidian/plugins/homepage/manifest.json | 13 -
.obsidian/plugins/homepage/styles.css | 231 -
.../plugins/obsidian-excalidraw-plugin/data.json | 819 ----
.../plugins/obsidian-excalidraw-plugin/main.js | 10 -
.../obsidian-excalidraw-plugin/manifest.json | 12 -
.../plugins/obsidian-excalidraw-plugin/styles.css | 1 -
.obsidian/plugins/obsidian-git/main.js | 442 --
.obsidian/plugins/obsidian-git/manifest.json | 10 -
.obsidian/plugins/obsidian-git/styles.css | 705 ----
.obsidian/plugins/obsidian-kanban/main.js | 153 -
.obsidian/plugins/obsidian-kanban/manifest.json | 11 -
.obsidian/plugins/obsidian-kanban/styles.css | 1 -
.obsidian/workspace.json | 246 --
4. Obsidian/02 Configuration.md | 130 +
.../Op\303\251rateur de recherche.md" | 0
.../filtres de recherche.md" | 0
.../structurer sa recherche.md" | 0
5. Langage HTML/Attributs.md | 0
"2. Langage HTML/HTML S\303\251mantique.md" | 0
6. Langage HTML/Les balises.md | 0
7. Langage CSS/Bonne pratiques.md | 0
8. Langage CSS/Pseudoclasses.md | 0
"3. Langage CSS/S\303\251lecteurs.md" | 0
9. Obsidian/Base Obsidian.md | 0
10. Obsidian/Configuration.md | 0
11. Obsidian/Plugins.md | 0
12. Linux/Commandes Linux.md | 0
13. Linux/Concept Linux.md | 0
14. Linux/Installer Linux.md | 0
15. GIT/Commande GIT.md | 0
16. GIT/Fonctionnement de GIT.md | 0
.../Probl\303\250mes techniques.md" | 0
17. Markdown/Syntaxe.md | 0
18. VS Code/Raccourcis VSCode.md | 0
CSS/Bonne pratique CSS.md | 112 -
README.md | 48 -
45 files changed, 130 insertions(+), 7363 deletions(-)
delete mode 100755 .obsidian/app.json
delete mode 100755 .obsidian/appearance.json
delete mode 100755 .obsidian/community-plugins.json
delete mode 100755 .obsidian/core-plugins.json
delete mode 100755 .obsidian/graph.json
delete mode 100755 .obsidian/plugins/calendar/data.json
delete mode 100755 .obsidian/plugins/calendar/main.js
delete mode 100755 .obsidian/plugins/calendar/manifest.json
delete mode 100755 .obsidian/plugins/homepage/main.js
delete mode 100755 .obsidian/plugins/homepage/manifest.json
delete mode 100755 .obsidian/plugins/homepage/styles.css
delete mode 100755 .obsidian/plugins/obsidian-excalidraw-plugin/data.json
delete mode 100755 .obsidian/plugins/obsidian-excalidraw-plugin/main.js
delete mode 100755 .obsidian/plugins/obsidian-excalidraw-plugin/manifest.json
delete mode 100755 .obsidian/plugins/obsidian-excalidraw-plugin/styles.css
delete mode 100755 .obsidian/plugins/obsidian-git/main.js
delete mode 100755 .obsidian/plugins/obsidian-git/manifest.json
delete mode 100755 .obsidian/plugins/obsidian-git/styles.css
delete mode 100755 .obsidian/plugins/obsidian-kanban/main.js
delete mode 100755 .obsidian/plugins/obsidian-kanban/manifest.json
delete mode 100755 .obsidian/plugins/obsidian-kanban/styles.css
delete mode 100755 .obsidian/workspace.json
create mode 100644 04. Obsidian/02 Configuration.md
delete mode 100755 "1. M\303\251thodes de recherche sur l'internet/Op\303\251rateur de recherche.md"
delete mode 100755 "1. M\303\251thodes de recherche sur l'internet/filtres de recherche.md"
delete mode 100755 "1. M\303\251thodes de recherche sur l'internet/structurer sa recherche.md"
delete mode 100755 2. Langage HTML/Attributs.md
delete mode 100755 "2. Langage HTML/HTML S\303\251mantique.md"
delete mode 100755 2. Langage HTML/Les balises.md
delete mode 100755 3. Langage CSS/Bonne pratiques.md
delete mode 100755 3. Langage CSS/Pseudoclasses.md
delete mode 100755 "3. Langage CSS/S\303\251lecteurs.md"
delete mode 100755 4. Obsidian/Base Obsidian.md
delete mode 100755 4. Obsidian/Configuration.md
delete mode 100755 4. Obsidian/Plugins.md
delete mode 100755 5. Linux/Commandes Linux.md
delete mode 100755 5. Linux/Concept Linux.md
delete mode 100755 5. Linux/Installer Linux.md
delete mode 100755 6. GIT/Commande GIT.md
delete mode 100755 6. GIT/Fonctionnement de GIT.md
delete mode 100755 "7. Espace de travail/Probl\303\250mes techniques.md"
delete mode 100755 8. Markdown/Syntaxe.md
delete mode 100755 9. VS Code/Raccourcis VSCode.md
delete mode 100644 CSS/Bonne pratique CSS.md
delete mode 100755 README.md
Vérification du niveau de commit
git log --oneline
97692T@PWVD4320 MINGW64 ~/Documents/Obsidian/simplon-2026 (21-obsidian-configuration)
$ git log --oneline
6ca1979 (HEAD -> 21-obsidian-configuration, origin/52-create-the-contributing-md, main) 9 homepage (#40)
4d5f004 Doc bonnes pratiques CSS (#31)
7800efd (origin/36-raccourcis-vscode, origin/24-installer-linux, origin/2-epic-langage-html) doc: initialisation vault obsidian
051cf58 vault backup: 2026-01-29 15:21:07
894a39d Initial commit
Vérification du status
git status
97692T@PWVD4320 MINGW64 ~/Documents/Obsidian/simplon-2026 (21-obsidian-configuration)
$ git status
On branch 21-obsidian-configuration
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
deleted: .obsidian/app.json
deleted: .obsidian/appearance.json
deleted: .obsidian/community-plugins.json
deleted: .obsidian/core-plugins.json
deleted: .obsidian/graph.json
deleted: .obsidian/plugins/calendar/data.json
deleted: .obsidian/plugins/calendar/main.js
deleted: .obsidian/plugins/calendar/manifest.json
deleted: .obsidian/plugins/homepage/main.js
deleted: .obsidian/plugins/homepage/manifest.json
deleted: .obsidian/plugins/homepage/styles.css
deleted: .obsidian/plugins/obsidian-excalidraw-plugin/data.json
deleted: .obsidian/plugins/obsidian-excalidraw-plugin/main.js
deleted: .obsidian/plugins/obsidian-excalidraw-plugin/manifest.json
deleted: .obsidian/plugins/obsidian-excalidraw-plugin/styles.css
deleted: .obsidian/plugins/obsidian-git/main.js
deleted: .obsidian/plugins/obsidian-git/manifest.json
deleted: .obsidian/plugins/obsidian-git/styles.css
deleted: .obsidian/plugins/obsidian-kanban/main.js
deleted: .obsidian/plugins/obsidian-kanban/manifest.json
deleted: .obsidian/plugins/obsidian-kanban/styles.css
deleted: .obsidian/workspace.json
new file: 04. Obsidian/02 Configuration.md
deleted: "1. M\303\251thodes de recherche sur l'internet/Op\303\251rateur de recherche.md"
deleted: "1. M\303\251thodes de recherche sur l'internet/filtres de recherche.md"
deleted: "1. M\303\251thodes de recherche sur l'internet/structurer sa recherche.md"
deleted: 2. Langage HTML/Attributs.md
deleted: "2. Langage HTML/HTML S\303\251mantique.md"
deleted: 2. Langage HTML/Les balises.md
deleted: 3. Langage CSS/Bonne pratiques.md
deleted: 3. Langage CSS/Pseudoclasses.md
deleted: "3. Langage CSS/S\303\251lecteurs.md"
deleted: 4. Obsidian/Base Obsidian.md
deleted: 4. Obsidian/Configuration.md
deleted: 4. Obsidian/Plugins.md
deleted: 5. Linux/Commandes Linux.md
deleted: 5. Linux/Concept Linux.md
deleted: 5. Linux/Installer Linux.md
deleted: 6. GIT/Commande GIT.md
deleted: 6. GIT/Fonctionnement de GIT.md
deleted: "7. Espace de travail/Probl\303\250mes techniques.md"
deleted: 8. Markdown/Syntaxe.md
deleted: 9. VS Code/Raccourcis VSCode.md
deleted: CSS/Bonne pratique CSS.md
deleted: README.md
Pour remettre le fichier en “rouge” et ne pas le remettre dans git
git restore --staged .obsidian
97692T@PWVD4320 MINGW64 ~/Documents/Obsidian/simplon-2026 (21-obsidian-configuration)
$ git restore --staged .obsidian
Vérification du status
git status
97692T@PWVD4320 MINGW64 ~/Documents/Obsidian/simplon-2026 (21-obsidian-configuration)
$ git status
On branch 21-obsidian-configuration
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
new file: 04. Obsidian/02 Configuration.md
deleted: "1. M\303\251thodes de recherche sur l'internet/Op\303\251rateur de recherche.md"
deleted: "1. M\303\251thodes de recherche sur l'internet/filtres de recherche.md"
deleted: "1. M\303\251thodes de recherche sur l'internet/structurer sa recherche.md"
deleted: 2. Langage HTML/Attributs.md
deleted: "2. Langage HTML/HTML S\303\251mantique.md"
deleted: 2. Langage HTML/Les balises.md
deleted: 3. Langage CSS/Bonne pratiques.md
deleted: 3. Langage CSS/Pseudoclasses.md
deleted: "3. Langage CSS/S\303\251lecteurs.md"
deleted: 4. Obsidian/Base Obsidian.md
deleted: 4. Obsidian/Configuration.md
deleted: 4. Obsidian/Plugins.md
deleted: 5. Linux/Commandes Linux.md
deleted: 5. Linux/Concept Linux.md
deleted: 5. Linux/Installer Linux.md
deleted: 6. GIT/Commande GIT.md
deleted: 6. GIT/Fonctionnement de GIT.md
deleted: "7. Espace de travail/Probl\303\250mes techniques.md"
deleted: 8. Markdown/Syntaxe.md
deleted: 9. VS Code/Raccourcis VSCode.md
deleted: CSS/Bonne pratique CSS.md
deleted: README.md
Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
deleted: .obsidian/app.json
deleted: .obsidian/appearance.json
deleted: .obsidian/community-plugins.json
deleted: .obsidian/core-plugins.json
deleted: .obsidian/graph.json
deleted: .obsidian/plugins/calendar/data.json
deleted: .obsidian/plugins/calendar/main.js
deleted: .obsidian/plugins/calendar/manifest.json
deleted: .obsidian/plugins/homepage/main.js
deleted: .obsidian/plugins/homepage/manifest.json
deleted: .obsidian/plugins/homepage/styles.css
deleted: .obsidian/plugins/obsidian-excalidraw-plugin/data.json
deleted: .obsidian/plugins/obsidian-excalidraw-plugin/main.js
deleted: .obsidian/plugins/obsidian-excalidraw-plugin/manifest.json
deleted: .obsidian/plugins/obsidian-excalidraw-plugin/styles.css
deleted: .obsidian/plugins/obsidian-git/main.js
deleted: .obsidian/plugins/obsidian-git/manifest.json
deleted: .obsidian/plugins/obsidian-git/styles.css
deleted: .obsidian/plugins/obsidian-kanban/main.js
deleted: .obsidian/plugins/obsidian-kanban/manifest.json
deleted: .obsidian/plugins/obsidian-kanban/styles.css
deleted: .obsidian/workspace.json
A faire sur chaque fichier que l’on retirer de git
git restore --staged README.md
Si on a un nom de fichier exotique :
Ici les guillemets sont très importants car ça va échapper les espaces et ne pas s’arrêter dessus. Les éléments \303\250 correspond à un caractère spécial, qu’il faut remplacer par le caractère adéquat.
"7. Espace de travail/Probl\303\250mes techniques.md"
Remplacer le texte présent dans git :
git restore --staged "7. Espace de travail/Problèmes techniques.md"
Une fois tout nettoyé, refaire un commit
git commit -m "feat: Doc de Configuration d'obsidian"
97692T@PWVD4320 MINGW64 ~/Documents/Obsidian/simplon-2026 (21-obsidian-configuration)
$ git commit -m "feat: Doc de Configuration d'obsidian"
[21-obsidian-configuration 34982e5] feat: Doc de Configuration d'obsidian
1 file changed, 130 insertions(+)
create mode 100644 04. Obsidian/02 Configuration.md
Pousser le code nettoyé
git push --force
97692T@PWVD4320 MINGW64 ~/Documents/Obsidian/simplon-2026 (21-obsidian-configuration)
$ git push --force
fatal: The current branch 21-obsidian-configuration has no upstream branch.
To push the current branch and set the remote as upstream, use
git push --set-upstream origin 21-obsidian-configuration
To have this happen automatically for branches without a tracking
upstream, see 'push.autoSetupRemote' in 'git help config'.
On obtient un message fatal mais c’est normal. faire la commande suivante qui est équivalente à celle demandée
git push --force -u origin 21-obsidian-configuration
97692T@PWVD4320 MINGW64 ~/Documents/Obsidian/simplon-2026 (21-obsidian-configuration)
$ git push --force -u origin 21-obsidian-configuration
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Delta compression using up to 4 threads
Compressing objects: 100% (3/3), done.
Writing objects: 100% (4/4), 1.68 KiB | 574.00 KiB/s, done.
Total 4 (delta 1), reused 0 (delta 0), pack-reused 0 (from 0)
remote: Resolving deltas: 100% (1/1), completed with 1 local object.
To https://github.com/shiipou/simplon-2026.git
+ 7ca9ca3...34982e5 21-obsidian-configuration -> 21-obsidian-configuration (forced update)
branch '21-obsidian-configuration' set up to track 'origin/21-obsidian-configuration'.
Contrôler le status
git status
97692T@PWVD4320 MINGW64 ~/Documents/Obsidian/simplon-2026 (21-obsidian-configuration)
$ git status
On branch 21-obsidian-configuration
Your branch is up to date with 'origin/21-obsidian-configuration'.
Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
deleted: .obsidian/app.json
deleted: .obsidian/appearance.json
deleted: .obsidian/community-plugins.json
deleted: .obsidian/core-plugins.json
deleted: .obsidian/graph.json
deleted: .obsidian/plugins/calendar/data.json
deleted: .obsidian/plugins/calendar/main.js
deleted: .obsidian/plugins/calendar/manifest.json
deleted: .obsidian/plugins/homepage/main.js
deleted: .obsidian/plugins/homepage/manifest.json
deleted: .obsidian/plugins/homepage/styles.css
deleted: .obsidian/plugins/obsidian-excalidraw-plugin/data.json
deleted: .obsidian/plugins/obsidian-excalidraw-plugin/main.js
deleted: .obsidian/plugins/obsidian-excalidraw-plugin/manifest.json
deleted: .obsidian/plugins/obsidian-excalidraw-plugin/styles.css
deleted: .obsidian/plugins/obsidian-git/main.js
deleted: .obsidian/plugins/obsidian-git/manifest.json
deleted: .obsidian/plugins/obsidian-git/styles.css
deleted: .obsidian/plugins/obsidian-kanban/main.js
deleted: .obsidian/plugins/obsidian-kanban/manifest.json
deleted: .obsidian/plugins/obsidian-kanban/styles.css
deleted: .obsidian/workspace.json
deleted: "1. M\303\251thodes de recherche sur l'internet/Op\303\251rateur de recherche.md"
deleted: "1. M\303\251thodes de recherche sur l'internet/filtres de recherche.md"
deleted: "1. M\303\251thodes de recherche sur l'internet/structurer sa recherche.md"
deleted: 2. Langage HTML/Attributs.md
deleted: "2. Langage HTML/HTML S\303\251mantique.md"
deleted: 2. Langage HTML/Les balises.md
deleted: 3. Langage CSS/Bonne pratiques.md
deleted: 3. Langage CSS/Pseudoclasses.md
deleted: "3. Langage CSS/S\303\251lecteurs.md"
deleted: 4. Obsidian/Base Obsidian.md
deleted: 4. Obsidian/Configuration.md
deleted: 4. Obsidian/Plugins.md
deleted: 5. Linux/Commandes Linux.md
deleted: 5. Linux/Concept Linux.md
deleted: 5. Linux/Installer Linux.md
deleted: 6. GIT/Commande GIT.md
deleted: 6. GIT/Fonctionnement de GIT.md
deleted: "7. Espace de travail/Probl\303\250mes techniques.md"
deleted: 8. Markdown/Syntaxe.md
deleted: 9. VS Code/Raccourcis VSCode.md
deleted: CSS/Bonne pratique CSS.md
deleted: README.md
no changes added to commit (use "git add" and/or "git commit -a")
Effacer toutes les modifications faites en local (les rouges)
git restore .
97692T@PWVD4320 MINGW64 ~/Documents/Obsidian/simplon-2026 (21-obsidian-configuration)
$ git restore .
Vérification du status
git status
97692T@PWVD4320 MINGW64 ~/Documents/Obsidian/simplon-2026 (21-obsidian-configuration)
$ git status
On branch 21-obsidian-configuration
Your branch is up to date with 'origin/21-obsidian-configuration'.
nothing to commit, working tree clean