Introduction

Introduction

Every project build at Beeldr should be version controlled with GIT. So even if we do not start / build the project, first steps will be to put de code in GIT.

Bitbucket

We use Bitbucket for our GIT code management.

Commit messages

• Use an imperative sentence in the subject line (source (opens new window))
• Commit each fix or task as a separate change. git rebase is your friend

Rebase vs Merge

Avoid merge commits!. Prefer rebase over merge.

A detailed description on how to rebase can be found here

Branches

In general Branches should always be created from the master branch. Deviation from that can result in lots of dificulties when releasing your code.

Default Branches

For smaller projects only a 'master' branch will be sufficient. For larger projects you can add staging/dev branches.

Using more branches (OTAP) will depend on scope of the poject and the number of Developers working on it.

Naming convention

When we make a branch, try to follow naming convention below:

<type>/<ticket-number>_<explaing-branch-name>

Example to create a brach on cli for a bug:

git push origin HEAD:refs/heads/BG/123_typo-in-git-guidelines

Example for a feature:

git push origin HEAD:refs/heads/FTR/200_adding-git-guidelines