• Git is a version control system for tracking changes
in computer files and coordinating work on those
files among multiple people.
• It is primarily used for source code management in software development,
but it can be used to keep track of changes in any set of files.
• As a distributed revision control system it is aimed at speed, data integrity,
and support for distributed, non-linear workflows.
GitLab is a web-based
Git repository manager
with wiki and issue tracking features,
using an open source license,
developed by GitLab Inc.
IDEA: Every new proposal starts with an idea, which usually come up in a chat.
For this stage, GitLab integrates with Mattermost.
ISSUE: The most effective way to discuss an idea is creating an issue for it.
Your team and your collaborators can help you to polish and improve it in the
PLAN: Once the discussion comes to an agreement, it's time to code. But wait!
First, we need to prioritize and organize our workflow. For this, we can use the
CODE: Now we're ready to write our code, once we have everything organized.
COMMIT: Once we're happy with our draft, we can commit our code to a feature-
branch with version control.
TEST: With GitLab CI, we can run our scripts to build and test our application.
REVIEW: Once our script works and our tests and builds succeeds, we are ready to
get our code reviewed and approved.
STAGING: Now it's time to deploy our code to a staging environment to check if
everything worked as we were expecting or if we still need adjustments.
PRODUCTION: When we have everything working as it should, it's time to deploy to
our production environment!
Continuous Integration is a software development practice in
which you build and test software every time a developer
pushes code to the application, and it happens several times
Continuous Integration: TEST - BUILD
Continuous Delivery is a software engineering approach in
which continuous integration, automated testing, and
automated deployment capabilities allow software to be
developed and deployed rapidly, reliably and repeatedly with
minimal human intervention. Still, the deployment to
production is defined strategically and triggered manually.
Continuous Delivery: TEST - BUILD - - DEPLOY
Continuous Deployment is a software development practice in
which every code change goes through the entire pipeline
and is put into production automatically, resulting in many
production deployments every day.
Continuous Deployment: TEST - BUILD - - DEPLOY
Commit changes to head (but not yet to the remote
git commit -m "Commit message"
Commit any files you've added with git add, and also commit
any files you've changed since then:
git commit -a
Connect to a remote repository
If you haven't connected your local repository to a remote
server, add the server to be able to push to it:
git remote add origin <server>
List all currently configured remote repositories:
git remote -v
Create a new branch and switch to it:
git checkout -b <branchname>
Switch from one branch to another:
git checkout <branchname>
List all the branches in your repo, and also tell you what
branch you're currently in:
Delete the feature branch:
git branch -d <branchname>
Push the branch to your remote repository, so others can use it:
git push origin <branchname>
Push all branches to your remote repository:
git push --all origin
Update from the remote repository
Fetch and merge changes on the remote server to your
To merge a different branch into your active branch:
git merge <branchname>
View all the merge conflicts:
Update from the remote repository
View the conflicts against the base file:
git diff --base <filename>
Preview changes, before merging:
git diff <sourcebranch> <targetbranch>
After you have manually resolved any conflicts, you mark the
git add <filename>
You can use tagging to mark a significant changeset, such as
git tag 1.0.0 <commitID>
CommitId is the leading characters of the changeset ID, up to
10, but must be unique. Get the ID using:
Push all tags to remote repository:
git push --tags origin
Undo local changes
If you mess up, you can replace the changes in your working tree
with the last content in head:
Changes already added to the index, as well as new files, will be kept.
git checkout -- <filename>
Instead, to drop all your local changes and commits, fetch the latest
history from the server and point your local master branch at it, do
git fetch origin
git reset --hard origin/master