Age | Commit message (Expand) | Author |
---|---|---|
2017-10-13 | Refactor conflict resolution to contain git ops within Gitlab::Git | Alejandro Rodríguez |
2017-07-27 | Remove superfluous lib: true, type: redis, service: true, models: true, servi... | Rémy Coutable |
2017-05-12 | Fix conflict resolution from corrupted upstream | Sean McGivern |
2016-08-12 | Add more tests for conflicts | Sean McGivern |
2016-08-12 | Handle multiple merge conflict files in collection | Sean McGivern |