Skip to content
Snippets Groups Projects

Na/bhtalgorithmus

Closed Na/bhtalgorithmus
na/bhtalgorithmus into main
6 unresolved threads
Closed nicoa96 requested to merge na/bhtalgorithmus into main
6 unresolved threads
Compare
and
Show latest version
1 file
+ 0
− 60
Compare changes
  • Side-by-side
  • Inline
Instructions.txt deleted 100644 → 0
+ 0
− 60
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