Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
git-it-together
meetings
Commits
e0ece103
Commit
e0ece103
authored
Nov 29, 2016
by
French, Robert
Browse files
Update README.md
parent
3c66a2c2
Changes
1
Hide whitespace changes
Inline
Side-by-side
README.md
View file @
e0ece103
...
...
@@ -2,9 +2,10 @@
## Using code.ornl.gov
### Thursday 12/1, 9:00am in JICS Auditorium (5100 RM 128)
This session will cover accesssing code.ornl.gov using UCAMS or XCAMS, adding
external collaborators to projects, and setting up SSH keys for easy pushing and
pulling.
This session will cover
*
accesssing code.ornl.gov using UCAMS or XCAMS
*
adding external collaborators to projects
*
setting up SSH keys for easy pushing and pulling.
## What is a Merge Request?
### Thursday 12/22, 9:00am in JICS Auditorium (5100 RM 128)
...
...
@@ -13,4 +14,11 @@ walk through creating a merge request for a shared project, and we'll talk about
some of the issue that come up in accepting and vetting merge requests from
external collaborators
*
Thursday 12/19, 9:00am in JICS Auditorium (5100 RM 128)
\ No newline at end of file
## Branches for Fun and Profit
### Thursday 12/29, 9:00am in JICS Auditorium (5100 RM 128)
Branching is a central part of any version control system, and git's facilities
for branching are second to none. In this workshop we will cover:
*
branching as a means of organized brainstorming
*
syncing branches with gitlab
*
Simple merging of local branhces
\ No newline at end of file
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