Skip to content

Resolve conflicting merges

Kenneth Moreland requested to merge kmorel/vtk-m:resolve-conflicting-merges into master

Merge request !445 (merged) (Camera enhancements) and merge request !448 (merged) (Consolidate background color) had conflicting changes in View.h. Although git did not pick up on the conflict because each merge modified a different portion of View.h, the final merge with both of these resulted in a compile error.

Basically what happened was Consolidate background color changed all the View constructors to reflect changes. Camera enhancements added a new constructor to View using the old construction method. The new constructor with the old construction method caused an error.

Merge request reports