use git cf -p to use ours
git cf -p to generate dir a(base) and b(theirs)