Skip to content

Steph #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Steph #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01be5e1
steph
S-Warmenhoven Jun 5, 2021
3061eee
Merge branch 'main' of https://github.com/CodeCoreYVR/git_basics into…
S-Warmenhoven Jun 5, 2021
af48548
Trying to make a conflict
S-Warmenhoven Jun 5, 2021
edf0971
Deleted some things
S-Warmenhoven Jun 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

#git branching and merging practise

A branch is a series of commits

We can create a new branch using `git branch "<name_of_branch>"`
The new branch's root commit will be master commit of the branch you've "branched off of"

# To fetch and pull
# To fetch vs pull

git fetch -> getting all the commits from remote (github)

Expand Down
1 change: 1 addition & 0 deletions steph.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Hello, I'm Steph.