Git workflow used in Taraba Tech

Author: Milomir Dragović 1 minute reading 21.10.2022.

Create a branch on Gitlab.
```
git pull
```
```
git checkout <branchname>
```
Add only files that make up a small and coherent change
```
git add <file1> <file2> ...
```
Start an editor which lets you separate the commit message subject from the body.
```
git commit
```
Update your feature branch with the latest changes from the master by interactive rebase.
```
git rebase -i master
```
If you don’t have conflicts, skip this step. If you have conflicts, resolve them and continue rebase.
```
git add <file1> <file2> ...

git rebase --continue
```
Push your branch.
```
git push
```
If you change git history on your feature branch you may need to use the -f or --force flag.
Make a Merge Request. Assign peer reviewer.
Merge request will be accepted, merged and closed by a reviewer.
Remove your local feature branch if you're done.
```
git branch -d <branchname>
```