Skip to content

Commit

Permalink
saving
Browse files Browse the repository at this point in the history
  • Loading branch information
MozeBaltyk committed Jan 29, 2025
1 parent bb18a4c commit 021fa16
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion content/docs/Devops/SCM/git.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ git log -p <commit_nbr>
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
Expand Down
6 changes: 6 additions & 0 deletions content/docs/Virtualisation/KVM/basics.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 021fa16

Please sign in to comment.