Git

Workflow Tips

by Nick Wurzer, 2 August 2023

If you’re like me and this is your first exprience coding in the real world, it may take a while to get familiar with Git and GitLab. This may initially slow you down when working on tasks, so I aim to speed up the learning curve by showing some useful features of Git and GitLab. If you’re already familiar, then read on for a good review!

For an introduction to Git version control see Priya’s blog post.

Get To Know Git

by Priya Srinivasan, 2 March 2023

One of the most commonly used version control systems is Git. One should follow a proper workflow to perform the tasks in a efficient and consistent manner. Git was originally created by Linus Torvalds in 2005. Git has a great support for branching, merging, and rewriting repository history. Git is considered to be a standard for software development.

Summary of the workflow

1. Create a central repository
2. Cloning the central repository
3. Perform changes and commit
4. Rebase (solving any merge conflicts that arises)
5. Push the commits
6. Create a merge/pull request
7. Review and merge the pull/merge request

Create a Central Repository

The easiest way to set up a remote repository as a central point for collaboration is to use a service like GitLab or GitHub. In our team we use GitLab.com as this service is free to use, well-designed, has all the features we need and allows us to share our code outside our group. Using GitLab and GitHub are pretty straightforward so we won’t describe that here.