Add option to reconcile divergent branches for merge trees
Otherwise git gets sad and we get sad too
Signed-off-by: Veronika Kabatova vkabatov@redhat.com
Otherwise git gets sad and we get sad too
Signed-off-by: Veronika Kabatova vkabatov@redhat.com