Ill attempt to describe the basic workflow used on 98% of projects Ive worked on in the past few years in simple terms with some examples. There are a few concepts to keep in mind that will make life simpler.
First the master branch is always deployable. Its the golden standard you should always be able to branch from and deploy patches.
Second, feature branches and commits should always (ahem yeah I know) be related to a single request.
Thirdly, try to keep your branches merged on a semi-regular basis. The longer they…