Closed mitchell-then closed 5 years ago
Could you rebase your changes on master rather than merging master in?