-
Notifications
You must be signed in to change notification settings - Fork 0
Larvouu/Tools_and_MVP
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Folders and files
Name | Name | Last commit message | Last commit date | |
---|---|---|---|---|
Repository files navigation
ok branche 1 Un pull est d�conseill� quand y'a plusieurs branches. On conseille merge + fetsh pour merge la branche 1 avec la branche master : git checkout master git merge branche1 ok pour régler un conflict, on essaye de merge, si ça passe pas ca affiche <<<< head === >>> income On conserve ce qu'on veut là dedans puis on add/status/commit Puis le merge marche tranquille
About
No description, website, or topics provided.
Resources
Stars
Watchers
Forks
Releases
No releases published
Packages 0
No packages published