[Feature] Add support for resolving migration conflicts on the same branch

[jackton1]

Is this feature missing in the latest version?

• I'm using the latest release

Is your feature request related to a problem? Please describe.

Running migration fixer on the same branch doesn't correctly identify the files that should be updated and falsely reports a successful status

Describe the solution you'd like?

Running migration fixer on the base branch that a conflict was detected naively resolves conflicts by checking the migration tree

IF:

   c 
  /
a 
   \
    b -> d

USE

a  -> b -> d -> c

IF:

   c 
  /
a 
   \
    b

USE

a  -> b -> c  OR a  -> c -> b 

NOTE: This might require checking the modified time or some time value in git that includes the mtime

Describe alternatives you've considered?

No response

Anything else?

No response

Code of Conduct

• I agree to follow this project's Code of Conduct