Age | Commit message (Expand) | Author |
---|---|---|
2017-05-12 | Fix conflict resolution from corrupted upstream | Sean McGivern |
2017-03-01 | Enable and autocorrect the CustomErrorClass cop | Sean McGivern |
2016-10-13 | Allow setting content for resolutions | Sean McGivern |
2016-08-12 | Add more tests for conflicts | Sean McGivern |
2016-08-12 | Move resolving code to ResolveService | Sean McGivern |
2016-08-12 | Add blob_path to conflict file JSON | Sean McGivern |
2016-08-12 | Use same resolution format on FE and BE | Sean McGivern |
2016-08-12 | Fix specs | Sean McGivern |
2016-08-12 | Handle case where one side deleted the file | Sean McGivern |
2016-08-12 | Remove unneeded raise | Sean McGivern |
2016-08-12 | Fix MR conflict resolution commits | Sean McGivern |
2016-08-12 | Fix merge conflict reading for new diffs | Sean McGivern |
2016-08-12 | Allow resolving conflicts in MR controller | Sean McGivern |
2016-08-12 | Handle multiple merge conflict files in collection | Sean McGivern |