Skip to content
GitLab
About GitLab
GitLab: the DevOps platform
Explore GitLab
Install GitLab
How GitLab compares
Get started
GitLab docs
GitLab Learn
Pricing
Talk to an expert
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Projects
Groups
Snippets
Sign up now
Login
Sign in / Register
Toggle navigation
Menu
Open sidebar
sjohnston
git_challenge
Commits
536af322
Commit
536af322
authored
May 25, 2017
by
Whitney Armstrong
Browse files
First commit
new file: README.md new file: names/whit.txt
parents
Changes
2
Hide whitespace changes
Inline
Side-by-side
README.md
0 → 100644
View file @
536af322
Git Challenge
=============
A low pressure way to get familiarized with git.
The Challenges
--------------
### Level : easy
1.
Fork this repository.
2.
In a single commit, add a file with your name as the title in the "names"
directory.
3.
In another commit, edit this file (README.md) and add your name to the list
below.
4.
Create a
*merge request*
for your changes.
### Level : moderate
1.
Create a new branch (called whatever you want)
2.
Commit some changes to your file (however you want).
3.
Submit a merge request from this branch (hint: the branch name should not be
named "master").
### Level : expert
1.
Create a merge conflict between your two branches.
2.
Submit a merge request for this resolved conflict's commit.
### Level : impossible
1.
Try to get me to merge a second item to this list. Hint: I won't :)
Name List
---------
-
Whit
-
...
names/whit.txt
0 → 100644
View file @
536af322
Derp.
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment