Closed Jacob-Stevens-Haas closed 5 months ago
This consists of backporting all changes that conflict with master. trapping-resolve consists of the complement of those changes, i.e. resolution of conflicts on the master branch
This consists of backporting all changes that conflict with master. trapping-resolve consists of the complement of those changes, i.e. resolution of conflicts on the master branch