If you're using if/else all over the place instead of a branch, what's to stop you from forgetting to remove one when you decide your new work is 'production ready'?
At the easiest level, I'd suggest using branches for new development. Bug fixes, new features, etc. Keep the work small; branches are cheap. Once its reviewed or tested merge it back into the master branch. This way 'in development' and 'complete' are abstracted to a level above code.
Also, imagine your project has 30 developers, or more. Would the strategy of if/else everywhere still work well?