Send the link below via email or IMCopy
Present to your audienceStart remote presentation
- Invited audience members will follow you as you navigate and present
- People invited to a presentation do not need a Prezi account
- This link expires 10 minutes after you close the presentation
- A maximum of 30 users can follow your presentation
- Learn more about this feature in our knowledge base article
Git & Gitlab
Transcript of Git & Gitlab
Git & GitLab
new site feature
Beginning of time
Created by linus torvalds
Strong support for
What do you need?
Configure Git in your machine
apt-get install git
Configure Git user
Generate SSH Key for secure access.
Code to upload!
Create a git repository online (i.e github/gitlab)
Go to your folder and initialize git
"git remote add origin https://longURL/ProjectName.git"
"git remote add origin ssh://email@example.com/blabla.git"
Clone from the repository in the server
"git clone ssh://firstname.lastname@example.org/project.git"
"git commit -m meaningful message"
"git push localbranch remotebranch"
Quite easy to remember
Creating branches is easy
git checkout -b name_branchname (create branch)
git checkout branchname (switch branch)
git checkout devtest
git checkout -b angular_feature
You can not switch with uncommited changes in the branch you work.
Split controller.js, services.js, directives.js, etc...
branch for new site feature
Added features for new site
angular js feature finished
Bug fix xxx.yy
Merge Bug fix
Merge Request Angular feature into devtest
Merge Request New Site
Run the command:
"git merge branchname"
This will merge a branch into the actual branch that you are working.
You should know what you really do when you run this, risk of merge conflicts
In our example:
Switch to devtest,
git checkout devtest
git merge angular_feature
git branch -d angular_feature
git push origin --delete angular_feature
Anything that can possibly go wrong, does.
What can you do?
When a conflict happens, you need to manually solve it.
Do not worry, git will mark the conflicts in the files.
Fix the merge conflicts, add the modified files, commit and push to remote.
You can always cancel the merge.
Tags allow easy reverts in history, similar to milestones
git tag -a 1402
More info on git:
Succesful branching model: http://nvie.com/posts/a-successful-git-branching-model/
Git book: http://git-scm.com/book
Lets play with the gitlab
Presentation by Alberto Lorente Leal