Git

Hello, buddy.
Would be great to have some structured git workflow, so I suggest next:

---

If feature?

git checkout master (if you are not on master)
git pull
git checkout -b features/*short name of new the feature*

---

If fix?

git checkout master (if you are not on master)
git pull
git checkout -b fixes/*short name of the fix*

---

If you branch is out-dated, you need to merge it with master, then to next:

git checkout master (if you are not on master)
git pull
git checkout *name of your branch*
git rebase master

If you have conflicts, fix them and then:

git add .
git rebase --continue

If you don't want to go on with rebasing:

git rebase --abort