From b6b6f0eb9e1e5487ebf90a9149fbbc77169e8981 Mon Sep 17 00:00:00 2001 From: Kacy Luzzardi Date: Fri, 30 Jan 2026 13:07:19 +0100 Subject: [PATCH 1/3] Add upstream & upstreamfr commands Signed-off-by: Kacy Luzzardi --- src/commandes/upstream.js | 34 ++++++++++++++++++++++++++++++++++ src/commandes/upstreamfr.js | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 src/commandes/upstream.js create mode 100644 src/commandes/upstreamfr.js diff --git a/src/commandes/upstream.js b/src/commandes/upstream.js new file mode 100644 index 0000000..7b0acf1 --- /dev/null +++ b/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." + } + ] +} \ No newline at end of file diff --git a/src/commandes/upstreamfr.js b/src/commandes/upstreamfr.js new file mode 100644 index 0000000..e300231 --- /dev/null +++ b/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." + } + ] +} \ No newline at end of file From 38204074da305895ab66d4528c8f9c54f9317cac Mon Sep 17 00:00:00 2001 From: Kacy Luzzardi Date: Fri, 30 Jan 2026 16:41:55 +0100 Subject: [PATCH 2/3] Rename commands to fetchchanges & fetchchangesfr --- src/commandes/{upstream.js => fetchchanges.js} | 0 src/commandes/{upstreamfr.js => fetchchangesfr.js} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename src/commandes/{upstream.js => fetchchanges.js} (100%) rename src/commandes/{upstreamfr.js => fetchchangesfr.js} (100%) diff --git a/src/commandes/upstream.js b/src/commandes/fetchchanges.js similarity index 100% rename from src/commandes/upstream.js rename to src/commandes/fetchchanges.js diff --git a/src/commandes/upstreamfr.js b/src/commandes/fetchchangesfr.js similarity index 100% rename from src/commandes/upstreamfr.js rename to src/commandes/fetchchangesfr.js From 24d7e055ea6de2b4a459066794fe4f722e9674e2 Mon Sep 17 00:00:00 2001 From: Kacy Luzzardi Date: Fri, 30 Jan 2026 16:45:46 +0100 Subject: [PATCH 3/3] Remove git checkout cmd & use HTTPS repo URL --- src/commandes/fetchchanges.js | 4 ++-- src/commandes/fetchchangesfr.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/commandes/fetchchanges.js b/src/commandes/fetchchanges.js index 7b0acf1..f5734af 100644 --- a/src/commandes/fetchchanges.js +++ b/src/commandes/fetchchanges.js @@ -4,7 +4,7 @@ module.exports = { "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`" + "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 https://github.com/dscalzi/HeliosLauncher.git`" }, { "title": "2.", @@ -16,7 +16,7 @@ module.exports = { }, { "title": "4.", - "description": "You can now update your local branch with `git checkout master` then `git merge upstream/master`" + "description": "You can now update your local branch and merge the latest changes on the original repo with `git merge upstream/master`" }, { "title": "5.", diff --git a/src/commandes/fetchchangesfr.js b/src/commandes/fetchchangesfr.js index e300231..63f86ff 100644 --- a/src/commandes/fetchchangesfr.js +++ b/src/commandes/fetchchangesfr.js @@ -16,7 +16,7 @@ module.exports = { }, { "title": "4.", - "description": "Procédez à la mise à jour de votre branche locale à l'aide de `git checkout master` puis `git merge upstream/master`" + "description": "Procédez à la mise à jour de votre branche locale et à la fusion des derniers changements sur le repo originel à l'aide de `git merge upstream/master`" }, { "title": "5.",