Add upstream & upstreamfr commands

Author: Kacy Luzzardi

src/commandes/upstream.js

@@ -0,0 +1,34 @@
+module.exports = {
+	"title": "Update launcher from upstream",
+	"description": "Here's a quick guide to fetch the latest changes from the original repository.",
+	"fields": [
+		{
+			"title": "1.",
+			"description": "First, you'll need to add the original repo as a remote origin. If you already done so, you can skip this step.\n`git remote add upstream git@github.com:dscalzi/HeliosLauncher.git`"
+		},
+		{
+			"title": "2.",
+			"description": "Ensure your git tree is clean, meaning every changes you made have been committed and pushed to your repo."
+		},
+		{
+			"title": "3.",
+			"description": "You may now fetch the history from the original repository using `git fetch upstream`"
+		},
+		{
+			"title": "4.",
+			"description": "You can now update your local branch with `git checkout master` then `git merge upstream/master`"
+		},
+		{
+			"title": "5.",
+			"description": "Fix any merge conflict you may have. Here's an article from Github that may help you : [Resolving a merge conflict using the command line](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line)"
+		},
+		{
+			"title": "6.",
+			"description": "Commit and push your changes"
+		},
+		{
+			"title": "7.",
+			"description": "Your repo is up to date! You can now push an update to your players."
+		}
+	]
+}

src/commandes/upstreamfr.js

@@ -0,0 +1,34 @@
+module.exports = {
+	"title": "Mettre à jour le launcher",
+	"description": "Comment mettre à jour le launcher avec les modifications du repo originel ?",
+	"fields": [
+		{
+			"title": "1.",
+			"description": "Premièrement, vous devez ajouter le repo originel en tant qu'origine distance. Si vous l'avez déjà fait, passez cette étape.\n`git remote add upstream git@github.com:dscalzi/HeliosLauncher.git`"
+		},
+		{
+			"title": "2.",
+			"description": "Assurez-vous que votre branche locale est propre, autrement dit, que toutes vos modifications ont bien été \"commit\" et poussées."
+		},
+		{
+			"title": "3.",
+			"description": "Vous pouvez maintenant récupérer l'historique du repo originel avec `git fetch upstream`"
+		},
+		{
+			"title": "4.",
+			"description": "Procédez à la mise à jour de votre branche locale à l'aide de `git checkout master` puis `git merge upstream/master`"
+		},
+		{
+			"title": "5.",
+			"description": "Réparez les potentils conflits de fusion que vous pourriez avoir. Voilà un article de GitHub pour vous aider : [Résolution d’un conflit de fusion en utilisant la ligne de commande](https://docs.github.com/fr/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line)"
+		},
+		{
+			"title": "6.",
+			"description": "Faîtes un \"commit\" et poussez vos changements."
+		},
+		{
+			"title": "7.",
+			"description": "Votre repo est maintenant à jour ! Vous pouvez publier une mise à jour à vos joueurs."
+		}
+	]
+}