title: Git Workflow advice
body: <p>First of all I'm not very experienced with Git and I am looking for some advices because I am facing the following issue: my department is having the following branches and using the continuous delivery pipelines in Git:</p>
  
  <ol>
  <li>DEV which has a corresponding branch (called master) in Git </li>
  <li>PROD with production branch in Git so when we merge master in the Prod branch all our developments goes to Prod environment. </li>
  </ol>
  
  <p>How we proceed: for every new feature we create a new feature branch on master and we commit the changes on master in order to have them on the Test environment and check if they work. So on master there are different commits for features that may be ready to go in Prod and other features that are still in development/test phase. It's even getting more complex if more people works on same things, changing same files for example.</p>
  
  <p>So we only have DEV and PROD and it's not possible to have another extra environment.</p>
  
  <p>And because of that we face some issues when is time to promote those changes to PROD like not promoting all changes or promoting changes that are not yet ready for PROD. </p>
  
  <p>So my question is what will be in your opinion the best practice scenario for this specific situation? So if you have some experience any help is very much appreciated. </p>
  
  <p>Thanks a lot for taking your time to read my question!</p>