I\'ve got two branches A and B, and B is based on A but has had significant refactoring. Development has continued on A and B simultaneously and we have been merging A onto