diff --git a/content/docs/Devops/SCM/git.md b/content/docs/Devops/SCM/git.md index ce123c68..363d0ae9 100644 --- a/content/docs/Devops/SCM/git.md +++ b/content/docs/Devops/SCM/git.md @@ -81,7 +81,7 @@ git log -p git log --oneline --decorate --graph --all : Voir en graphes tous les commits ``` -## Resolve conflict +## Resolve conflict During a push, you realise that someone already pushed, so git ask you to pull first ```bash diff --git a/content/docs/Virtualisation/KVM/basics.md b/content/docs/Virtualisation/KVM/basics.md index 7929f0d3..537807ff 100644 --- a/content/docs/Virtualisation/KVM/basics.md +++ b/content/docs/Virtualisation/KVM/basics.md @@ -33,6 +33,12 @@ sudo systemctl enable libvirtd sudo systemctl status libvirtd ``` +### Basic Checks + +```bash +virsh nodeinfo +``` + ### Config a Bridge network Important note that network are created with root user but VM with current user.