| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Improve detail of resolve conflict docs | James Ramsay | 2018-11-28 | 1 | -11/+25 |
| | | |||||
| * | Make it explicit that merge conflict feature commits to source branch | Annabel Dunstone Gray | 2018-05-21 | 1 | -1/+1 |
| | | |||||
| * | Add docs for resolve conflicts editor | Achilleas Pipinellis | 2017-01-24 | 1 | -0/+12 |
| | | | | | [ci skip] | ||||
| * | Handle non-UTF-8 conflicts gracefully21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-data | Sean McGivern | 2016-08-25 | 1 | -0/+1 |
| | | | | | | | | These can't be resolved in the UI because if they aren't in a UTF-8 compatible encoding, they can't be rendered as JSON. Even if they could, we would be implicitly changing the file encoding anyway, which seems like a bad idea. | ||||
| * | Reference the version 'UI resolve conflicts' was introduced | Achilleas Pipinellis | 2016-08-17 | 1 | -0/+4 |
| | | | | | [ci skip] | ||||
| * | Add merge conflict docs | Sean McGivern | 2016-08-12 | 1 | -0/+37 |
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |