Skip to content
Snippets Groups Projects
Commit b61796e6 authored by Francois Romain's avatar Francois Romain
Browse files

docs: corrige des fautes d'orthographe

parent 2232a02b
No related branches found
No related tags found
No related merge requests found
......@@ -18,7 +18,7 @@ cd camino-api
# Define the main repo as a remote named 'upstream'.
git remote add upstream https://github.com/MTES-MCT/camino-api.git
# Now you have two remotes: 'orign' (your fork) and 'upstream' (main repo).
# Now you have two remotes: 'origin' (your fork) and 'upstream' (main repo).
```
---
......@@ -60,7 +60,7 @@ git commit -a -m "fix: my fix message"
git pull --rebase upstream master
```
**This can result in conflicts** and this is normal. Fixing them is part of the process. To avoid conflicts, **warn your collegues so you don't work on the same files**.
**This can result in conflicts** and this is normal. Fixing them is part of the process. To avoid conflicts, **warn your co-workers so you don't work on the same files**.
### 4. Push your changes to your remote
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment