Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Refactor conflict resolution to contain git ops within Gitlab::Git | Alejandro RodrÃguez | 2017-10-12 | 1 | -1/+1 |
* | Stop MR conflict code from blowing up when branches are missingdm-no-conflicts-when-branches-are-missing | Douwe Maan | 2017-05-18 | 1 | -0/+7 |
* | Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-repos | Sean McGivern | 2017-05-12 | 1 | -0/+73 |