Skip to content

Add a merge conflict #3

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
ElliotAOram wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add a merge conflict #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
314363c
Add a merge conflict
ElliotAOram Mar 14, 2022
de78016
Merge branch 'master' into merge-1
ElliotAOram Mar 16, 2022
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
1 change: 0 additions & 1 deletion docs/add_commit.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,4 @@ git commit -m "My hello world" # This will tell git that we want to package all
# The origin doesn't know about your branch or your code at this point so we have to tell it where to put our branch when we push it.
# The --set-upstream part of the command say push our branch to the origin with the branch name <your branch name>
git push --set-upstream origin <your branch name>
# Now the link between the local repository and origin has been made (merge conflict), subsequent pushes can be done with just git push.
```