Show in the main UI the active branch you are working on(not just on the GIT left sidebar). This way I will stop making changes that are not meant for a specific branch 
Could be on top main bar or the bottom toolbar.
Something like:
<i class="fas fa-code-branch"></i> master