Currently it follows a single branch. The merge strategy is to merge with local changes taking priority over remote ones but this can be plugged-in. Rollbacks can be done by copying from history to current version. The only thing shaky thing is when there is a force push because local commits will be pushed back.