Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
comp-sci-project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
nguyed99
comp-sci-project
Commits
3ec3bea8
Commit
3ec3bea8
authored
1 year ago
by
nicoa96
Browse files
Options
Downloads
Patches
Plain Diff
Delete Instructions.txt
parent
d2fdcedd
No related branches found
No related tags found
3 merge requests
!6
Na/bhtalgorithmus
,
!5
Na/bhtalgorithmus
,
!1
Na/bhtalgorithmus
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Instructions.txt
+0
-60
0 additions, 60 deletions
Instructions.txt
with
0 additions
and
60 deletions
Instructions.txt
deleted
100644 → 0
+
0
−
60
View file @
d2fdcedd
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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment