Commit c356f1f4 authored by Overbeeke, Lennert van's avatar Overbeeke, Lennert van
Browse files


parent fd5f797a
# git-help
Basic steps for Git
## Purpose
To help teams at WFSR control their projects using Git.
The easy steps in this short course will teach you how to:
- start your project
- structure your project
- share your project
- successfully complete your project
## Introduction
- **Git** is software for version control of your documents and data
- Each addition and modification is tracked
- Each step is reversible; overwritten work is not lost
- Co-write a document simultaneously in two branches
- Git functionalities will be introduced step by step
- Git also works without GitLab
- **GitLab** is the online workspace that makes Git easier
- Has many, many extra functions outside of Git
- Backed up at WUR, just like the W:/ drive
- Look through your project's files like a file browser
- Easily compare versions or look up an old version
- Manage contributions from the team
- Manage time planning using Milestones and Issues
Basic tips for Git and GitLab - edited - edited #2 after comment
## Edit made in a branch
Multiple lines of text could be added
And the merge process should allow each lines to be discussed
and merged individually.
I also made an edit to lines in the original to see how that turns out
in a merge.
## Edit made during merge using Web IDE
You can further edit the documents using the Web IDE while in merge request mode.
Committing these changes just adds a commit to the branch being merged,
as if you made the edit before the merge request and then decided to merge.
The purpose for this is to edit your proposal without having to cancel and retry.
\ No newline at end of file
Markdown is supported
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