Try to re-enable fast-forward merge by committing conflicting changes and fixing tests (!9) · Merge requests · Reese Daniel / AIMS

Reese Daniel requested to merge fix-ff into dev Apr 26, 2022

This changes one conflicting line that appears to prevent a fast-forward merge of !8 (merged) . Even if it doesn't re-enable a web-based merge, it should at least make it easier to merge dev back into drr.

Try to re-enable fast-forward merge by committing conflicting changes and fixing tests

Merge request reports