Age | Commit message (Expand) | Author |
---|---|---|
2019-06-11 | Force source and target branch to binary mode | Stan Hu |
2019-06-11 | Fix UTF-8 conversion issues when resolving conflicts | Stan Hu |
2018-01-11 | Migrate Repository#can_be_merged? to Gitaly | Ahmad Sherif |
2018-01-02 | Simplify conflict resolution interface and code | Alejandro Rodríguez |
2017-12-27 | Incorporate ConflictsService.ResolveConflicts Gitaly RPC | Alejandro Rodríguez |
2017-12-27 | Incorporate ConflictsService.ListConflictFiles Gitaly RPC | Alejandro Rodríguez |