uptodate2

Instructions.txt

@@ -4,18 +4,18 @@ Heeelllooo
 
 source ~/.cache/pypoetry/virtualenvs/comp-sci-project-SyZqYvRp-py3.11/bin/activate
 
-to create a branch:
+--to create a branch:
 git checkout -b <name of the branch>
 
-put the branch online
+--put the branch online
 git push --set-upstream origin na/bhtalgorithmus
 
-Create the file
+--Create the file
 git add <File name>
 git commit -m "comment"
 git push
 
-please update your local branch by following these commands:
+--please update your local branch by following these commands:
 
 
 git checkout main
@@ -23,13 +23,19 @@ git pull --rebase
 git checkout -
 git rebase main
 
-man kann auch brauchen:
+--man kann auch brauchen:
 
-solve the conflict
+--solve the conflict
 git add <file name of conflict>
 git rebase --continue
 git push --force
 
-Please try out these commands asap!
+--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