From 3a1fb62ffc670050a705f0865b7f2fe4f2947711 Mon Sep 17 00:00:00 2001 From: Nicola <nicoa96@zedat.fu-berlin.de> Date: Sat, 23 Dec 2023 13:10:40 +0100 Subject: [PATCH] uptodate --- Instructions.txt | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Instructions.txt b/Instructions.txt index 98f0d68..50a66cf 100644 --- a/Instructions.txt +++ b/Instructions.txt @@ -36,3 +36,25 @@ git push ---------- git pull origin Nicola + +----------- +In case: + +nicolaalnicola@LAPTOP-A0GOD546:/mnt/c/Users/nicol/comp-sci-project$ git push +To git.imp.fu-berlin.de:nguyed99/comp-sci-project.git + ! [rejected] na/bhtalgorithmus -> na/bhtalgorithmus (non-fast-forward) +error: failed to push some refs to 'git.imp.fu-berlin.de:nguyed99/comp-sci-project.git' +hint: Updates were rejected because the tip of your current branch is behind +hint: its remote counterpart. Integrate the remote changes (e.g. +hint: 'git pull ...') before pushing again. +hint: See the 'Note about fast-forwards' in 'git push --help' for details. + +Do the following to keep your local branch up to date before pushing: + +git fetch origin +git checkout <branchname> +git merge origin/<branchname> +--press Exceute than exit +git pull origion <branchname> + +--now you can push again -- GitLab