Manage and merge git branches