Commit 7f0ded53 authored by Nicolas Descostes's avatar Nicolas Descostes
Browse files

tmp commit for the 'First steps on embl git' section

parent 80420a60
......@@ -3,6 +3,9 @@
## Table of content
1. [Introduction](#introduction)
2. [Getting started](#getting-started)
* [demo](#demo)
* [First steps on embl git](#first-steps-on-embl-git)
**Contributors:** Nicolas Descostes and Toby Hodges
......@@ -13,30 +16,32 @@ The Software Carpentry content being under CC-BY 4.0 license and GBCS having kin
## Introduction
**Slides:** [intro](pdf/intro.pdf)
Let's begin by having a look at what a life without git looks like:
![manuscript1](pictures/intro1.jpeg)
![manuscript1](pictures/intro/intro1.jpeg)
[1](https://medium.com/@fredrick.adegoke/version-control-systems-source-code-banking-efcbb9272aee)
![manuscript2](pictures/intro2.png)
![manuscript2](pictures/intro/intro2.png)
[2](http://www.phdcomics.com)
Git can not only prevent you experiencing these situations but also help you programming more efficiently:
![badpractice](pictures/intro3.jpeg)
![badpractice](pictures/intro/intro3.jpeg)
[3](http://www.phdcomics.com)
Version control systems start with a base version of the document and then record changes you make each step of the way. You can think of it as a recording of your progress: you can rewind to start at the base document and play back each change you made, eventually arriving at your more recent version.
![modification1](pictures/intro4.svg)
![modification1](pictures/intro/intro4.svg)
Once you think of changes as separate from the document itself, you can then think about “playing back” different sets of changes on the base document, ultimately resulting in different versions of that document. For example, two users can make independent sets of changes on the same document. Git enables collaborative work! Several people can work on the same document or the same program!
![modification2](pictures/intro5.svg)
![modification2](pictures/intro/intro5.svg)
Unless multiple users make changes to the same section of the document - a conflict - you can incorporate two sets of changes into the same base document.
![modification3](pictures/intro6.svg)
![modification3](pictures/intro/intro6.svg)
A version control system is a tool that keeps track of these changes for us, effectively creating different versions of our files. It allows us to decide which changes will be made to the next version (each record of these changes is called a commit), and keeps useful metadata about them. The complete history of commits for a particular project and their metadata make up a repository. Repositories can be kept in sync across different computers, facilitating collaboration among different people.
......@@ -46,9 +51,42 @@ Automated version control systems are nothing new. Tools like RCS, CVS, or Subve
* Version control is like an unlimited ‘undo’.
* Version control also allows many people to work in parallel.
## Getting started
### Demo
**Live demo of the content of the next section.**
### First steps on embl git
1. Connect to **git.embl.de** and use your regular login and password.
![log](pictures/First-steps-on-embl-git/step1.png)
2. Explore the welcome page
![Welcome](pictures/First-steps-on-embl-git/step2.png)
* A: By default, all the projects that you are involved in are displayed on this page. **A project is also called a 'repository'.**
* B: When creating a project, you can define access rights (**private, internal, public**; see below). This tab will restrict the view to your projects that are **private**.
* C: Search bar, search for a particular project by keywords.
* D: Create a new project (see below).
3. Explore projects
![projects](pictures/First-steps-on-embl-git/step3.png)
* A: Click on All to see all **repositories** hosted at EMBL. You can also filter these projects by 'Trending' or 'Most stars' features.
* B: Display the repositories by 'last updated', 'name', 'oldest updated', and other criteria.
* C: Display the repositories whether they are 'public', 'internal' or 'private'.
* D: The 'New project' icon is always accessible from the interface (see next step).
4. Create a new project
![projects](pictures/First-steps-on-embl-git/step4.png)
A repository slug is a URL-friendly version of a repository name,
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment