Created
March 15, 2022 10:50
-
-
Save nicovray/4a8ca68d86167be0bea0f7e97c68b264 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nico@nicubuntu:~/WCS/Git/Conflit$ git pull | |
remote: Enumerating objects: 5, done. | |
remote: Counting objects: 100% (5/5), done. | |
remote: Compressing objects: 100% (2/2), done. | |
remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0 | |
Dépaquetage des objets: 100% (3/3), 730 octets | 730.00 Kio/s, fait. | |
Depuis github.com:nicovray/Conflit | |
06fda63..b476f2f main -> origin/main | |
Fusion automatique de README.md | |
CONFLIT (contenu) : Conflit de fusion dans README.md | |
La fusion automatique a échoué ; réglez les conflits et validez le résultat. | |
nico@nicubuntu:~/WCS/Git/Conflit$ git add . | |
nico@nicubuntu:~/WCS/Git/Conflit$ git commit -m "suppression du REMOTE" | |
[main 7ba98a8] suppression du REMOTE | |
nico@nicubuntu:~/WCS/Git/Conflit$ git pull | |
Déjà à jour. | |
nico@nicubuntu:~/WCS/Git/Conflit$ git push origin main | |
Énumération des objets: 10, fait. | |
Décompte des objets: 100% (10/10), fait. | |
Compression par delta en utilisant jusqu'à 8 fils d'exécution | |
Compression des objets: 100% (4/4), fait. | |
Écriture des objets: 100% (6/6), 776 octets | 776.00 Kio/s, fait. | |
Total 6 (delta 0), réutilisés 0 (delta 0) | |
To github.com:nicovray/Conflit.git | |
b476f2f..7ba98a8 main -> main | |
nico@nicubuntu:~/WCS/Git/Conflit$ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment