From 3ec3bea85deaa3715a110e09c962535e29b61aa5 Mon Sep 17 00:00:00 2001 From: nicoa96 <nicoa96@zedat.fu-berlin.de> Date: Tue, 9 Jan 2024 14:24:05 +0000 Subject: [PATCH] Delete Instructions.txt --- Instructions.txt | 60 ------------------------------------------------ 1 file changed, 60 deletions(-) delete mode 100644 Instructions.txt diff --git a/Instructions.txt b/Instructions.txt deleted file mode 100644 index 50a66cf..0000000 --- a/Instructions.txt +++ /dev/null @@ -1,60 +0,0 @@ - -source ~/.cache/pypoetry/virtualenvs/comp-sci-project-SyZqYvRp-py3.11/bin/activate - ---to create a branch: -git checkout -b <name of the branch> - ---put the branch online -git push --set-upstream origin na/bhtalgorithmus - ---Create the file -git add <File name> -git commit -m "comment" -git push - ---please update your local branch by following these commands: - - -git checkout main -git pull --rebase -git checkout - -git rebase main - ---man kann auch brauchen: - ---solve the conflict -git add <file name of conflict> -git rebase --continue -git push --force - ---Please try out these commands asap! - ---rebase between different branches: ---Go to the branch you want to transfer to -git rebase <branch to rebase from> -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