Skip to content

Git Tutorial

1. Start working

When you start your day coding, you want to pull the incoming changes

git pull

2. Commit your changes

Once you’ve made some changes that work, you want to commit these changes so that they exist in the git log

# Stage the changes
git add .

# Commit the changes to the current branch
git commit -m "[YOUR-COMMIT-NAME-HERE]"

3. Push changes to GitLab

# Pull incoming changes
git pull

# Push changes
git push

4. Working on a new feature

Whenever you are going to work on a new feature or a new scrum card, you want to create a new feature branch.

First, make sure you are working on the ‘develop’ branch

# Switch to 'develop' branch
git checkout develop

# Pull the incoming changes from 'develop'
git pull

# Now make a feature.md branch based on 'develop'. 
# Make sure the name includes the: '/feature.md' annotation
git checkout -b "[YOUR-BRANCH-NAME]"

# Lastly, you'll want to send your feature.md branch to the server
git push --set-upstream origin "[YOUR-BRANCH-NAME]"

5. Merging my feature branch with GitLab

Done working on a feature? Here’s what you do. While on the feature branch:

  1. Commit your changes

  2. Update the branch with the incoming changes from ‘develop’ 

    git pull develop

  3. Got a merge conflict? Follow these steps. Proceed to step 4

  4. Go to GitLab -> ‘Merge requests’ and click on ‘Create merge request’ Create merge request screenshot

  5. Make sure your are merging to the correct branch, which is ‘develop’. Button change branches Select correct branch

Correct? Click: Compare branches and continue

  1. Insert a suitable title

  2. In the description, you’ll find the definition of done. Check if your feature meets the definition of done requirements. If they do, tick them off using ‘- [x]’

  3. Assign a reviewer. This person has to accept your merge request for it to be merged.

  4. You can add a Milestone if neccesary

  5. Click: ‘Create merge request’

6. Resolving merge conflicts

If you’ve pulled the ‘develop’ branch into your feature branch, it is possible you’ll get a merge conflict. Follow the next instructions to resolve this.

  1. Within VSCode, go to the file containing the conflict.

You’ll see something similar to the screenshot below: merge conflict vscode

  1. Solve the conflicts, then commit the Merge commit to the feature branch.

  2. Now make the merge request using these steps

Last update: December 5, 2022