Always TBD. Anything else is a complete and utter mess. Branch for development. Always rebased squashed and merged back to master and delete dev branch. Leaves clean git history with no mess and no merge issues. This is the way.