| Age | Commit message (Expand) | Author |
|---|---|---|
| 2019-06-10 | Single source of truth for merge requests | Achilleas Pipinellis |
| 2018-11-28 | Improve detail of resolve conflict docs | James Ramsay |
| 2018-05-21 | Make it explicit that merge conflict feature commits to source branch | Annabel Dunstone Gray |
| 2017-01-24 | Add docs for resolve conflicts editor | Achilleas Pipinellis |
| 2016-08-25 | Handle non-UTF-8 conflicts gracefully | Sean McGivern |
| 2016-08-17 | Reference the version 'UI resolve conflicts' was introduced | Achilleas Pipinellis |
| 2016-08-12 | Add merge conflict docs | Sean McGivern |
Welcome to mirror list, hosted at ThFree Co, Russian Federation.
 |
index : gitlab.com/gitlab-org/gitlab-foss.git | |
| Unnamed repository; edit this file 'description' to name the repository. | root |
| summaryrefslogtreecommitdiff |