[SOLVED] Editor Branch Merge Never Merges (Errorless)

Should I give that a try? I can jump back to those checkpoints, creates branches, merge, then merge into master to see if that works.