selecting and rerooting
automerged files needing recommit