README.md 996 Bytes
Newer Older
French, Robert's avatar
French, Robert committed
1
# Upcoming 'Git It Together' Workshops
French, Robert's avatar
French, Robert committed
2

French, Robert's avatar
French, Robert committed
3
## Using code.ornl.gov
French, Robert's avatar
French, Robert committed
4
5
**Thursday 12/1, 9:00am in JICS Auditorium (5100 RM 128)**

French, Robert's avatar
French, Robert committed
6
7
8
9
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.
French, Robert's avatar
French, Robert committed
10

French, Robert's avatar
French, Robert committed
11
## What is a Merge Request?
French, Robert's avatar
French, Robert committed
12
13
**Thursday 12/22, 9:00am in JICS Auditorium (5100 RM 128)**

French, Robert's avatar
French, Robert committed
14
15
16
17
18
Merge Requests are the core of collaboration in Gitlab. In this session, we'll 
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

French, Robert's avatar
French, Robert committed
19
## Branches for Fun and Profit
French, Robert's avatar
French, Robert committed
20
**Thursday 12/29, 9:00am in JICS Auditorium (5100 RM 128)**
French, Robert's avatar
French, Robert committed
21

French, Robert's avatar
French, Robert committed
22
23
24
25
26
27
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