

I am taking the work of a relative who has done much work over many years keeping track of one wing of my family, which is huge. They have many adoptions.
Most recently I found one father of two who divorced his wife and gave his two children to his brother while he remarried and had a third child. Since both sets of parents are on my tree, I moved the children but now have a merge conflict.
How are adoption dates and such situations as above best handled in Geni?