Instructions for returning student (#315)

* Instructions for returning student

* setup guides generated

---------

Co-authored-by: github-actions <[email protected]>

Author: julesvanrie

LINUX.md

@@ -354,6 +354,13 @@ mkdir -p ~/code/$GITHUB_USERNAME && cd $_
 gh repo fork lewagon/dotfiles --clone
 ```
 
+Now, your dotfiles might not be in sync anymore with the Le Wagon version. **Ask a TA** to run through these steps together:
+
+1. `git merge upstream/master`
+2. Check that you're not in MERGING state (if any conflicts resolve them)
+3. Do a `git diff HEAD~1 HEAD` to check what changed
+4. If nothing seems out of the ordinary, continue
+
 Run the `dotfiles` installer.
 
 ```bash
@@ -405,6 +412,13 @@ mkdir -p ~/code/$GITHUB_USERNAME && cd $_
 gh repo fork lewagon/dotfiles --clone
 ```
 
+Now, your dotfiles might not be in sync anymore with the Le Wagon version. **Ask a TA** to run through these steps together:
+
+1. `git merge upstream/master`
+2. Check that you're not in MERGING state (if any conflicts resolve them)
+3. Do a `git diff HEAD~1 HEAD` to check what changed
+4. If nothing seems out of the ordinary, continue
+
 Run the `dotfiles` installer.
 
 ```bash

VM.md

@@ -778,6 +778,13 @@ mkdir -p ~/code/$GITHUB_USERNAME && cd $_
 gh repo fork lewagon/dotfiles --clone
 ```
 
+Now, your dotfiles might not be in sync anymore with the Le Wagon version. **Ask a TA** to run through these steps together:
+
+1. `git merge upstream/master`
+2. Check that you're not in MERGING state (if any conflicts resolve them)
+3. Do a `git diff HEAD~1 HEAD` to check what changed
+4. If nothing seems out of the ordinary, continue
+
 Run the `dotfiles` installer.
 
 ```bash
@@ -829,6 +836,13 @@ mkdir -p ~/code/$GITHUB_USERNAME && cd $_
 gh repo fork lewagon/dotfiles --clone
 ```
 
+Now, your dotfiles might not be in sync anymore with the Le Wagon version. **Ask a TA** to run through these steps together:
+
+1. `git merge upstream/master`
+2. Check that you're not in MERGING state (if any conflicts resolve them)
+3. Do a `git diff HEAD~1 HEAD` to check what changed
+4. If nothing seems out of the ordinary, continue
+
 Run the `dotfiles` installer.
 
 ```bash

WINDOWS.md

@@ -906,6 +906,13 @@ mkdir -p ~/code/$GITHUB_USERNAME && cd $_
 gh repo fork lewagon/dotfiles --clone
 ```
 
+Now, your dotfiles might not be in sync anymore with the Le Wagon version. **Ask a TA** to run through these steps together:
+
+1. `git merge upstream/master`
+2. Check that you're not in MERGING state (if any conflicts resolve them)
+3. Do a `git diff HEAD~1 HEAD` to check what changed
+4. If nothing seems out of the ordinary, continue
+
 Run the `dotfiles` installer.
 
 ```bash
@@ -957,6 +964,13 @@ mkdir -p ~/code/$GITHUB_USERNAME && cd $_
 gh repo fork lewagon/dotfiles --clone
 ```
 
+Now, your dotfiles might not be in sync anymore with the Le Wagon version. **Ask a TA** to run through these steps together:
+
+1. `git merge upstream/master`
+2. Check that you're not in MERGING state (if any conflicts resolve them)
+3. Do a `git diff HEAD~1 HEAD` to check what changed
+4. If nothing seems out of the ordinary, continue
+
 Run the `dotfiles` installer.
 
 ```bash

_partials/dotfiles_new_laptop.md

@@ -15,6 +15,13 @@ mkdir -p ~/code/$GITHUB_USERNAME && cd $_
 gh repo fork lewagon/dotfiles --clone
 ```
 
+Now, your dotfiles might not be in sync anymore with the Le Wagon version. **Ask a TA** to run through these steps together:
+
+1. `git merge upstream/master`
+2. Check that you're not in MERGING state (if any conflicts resolve them)
+3. Do a `git diff HEAD~1 HEAD` to check what changed
+4. If nothing seems out of the ordinary, continue
+
 Run the `dotfiles` installer.
 
 ```bash

macOS.md

@@ -404,6 +404,13 @@ mkdir -p ~/code/$GITHUB_USERNAME && cd $_
 gh repo fork lewagon/dotfiles --clone
 ```
 
+Now, your dotfiles might not be in sync anymore with the Le Wagon version. **Ask a TA** to run through these steps together:
+
+1. `git merge upstream/master`
+2. Check that you're not in MERGING state (if any conflicts resolve them)
+3. Do a `git diff HEAD~1 HEAD` to check what changed
+4. If nothing seems out of the ordinary, continue
+
 Run the `dotfiles` installer.
 
 ```bash
@@ -455,6 +462,13 @@ mkdir -p ~/code/$GITHUB_USERNAME && cd $_
 gh repo fork lewagon/dotfiles --clone
 ```
 
+Now, your dotfiles might not be in sync anymore with the Le Wagon version. **Ask a TA** to run through these steps together:
+
+1. `git merge upstream/master`
+2. Check that you're not in MERGING state (if any conflicts resolve them)
+3. Do a `git diff HEAD~1 HEAD` to check what changed
+4. If nothing seems out of the ordinary, continue
+
 Run the `dotfiles` installer.
 
 ```bash