From 9946ac5dec11fd63dd383af19c87be5c82ba38ff Mon Sep 17 00:00:00 2001 From: "Benguria Elguezabal, Gorka" <gorka.benguria@tecnalia.com> Date: Sun, 24 Mar 2024 11:27:42 +0100 Subject: [PATCH] adds FORK_SYNC instructiones --- FORK_SYNC.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 FORK_SYNC.md diff --git a/FORK_SYNC.md b/FORK_SYNC.md new file mode 100644 index 00000000..ac40bfec --- /dev/null +++ b/FORK_SYNC.md @@ -0,0 +1,14 @@ +In order to sync manually with the upstream project, you can follow these steps: +- define an upstream remote pointing to the original project +- fetch the upstream remote +- merge the upstream remote with your local master branch + +Here is an example of how to do this: + +```bash +$ git remote add upstream git@gitlab.com:gitlab-org/ci-cd/docker-machine.git +$ git fetch upstream +$ git checkout main +$ git rebase upstream/main +``` + -- GitLab