I Got Lost in Git

In my current project, I got into a (very) minor issue with Git. This post will be like a short diary entry. We are using a feature branch workflow with feature branches created from the develop branch. We also have a master branch that is used for p...