gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.

Age	Commit message (Collapse)	Author
2018-12-13	Fix documentation for automatic merging	Yorick Peterse
	The strategy name and interval was incorrect, and the link back to the developer documentation was in the wrong place.
2018-12-11	Update automatic merging documentation	Yorick Peterse
	We're moving from merging + reverting to only merging with the `ours` strategy, removing the need for merge requests or reverting conflicts. For more details, refer to Merge Train merge request https://gitlab.com/gitlab-org/merge-train/merge_requests/6.
2018-12-04	Updated documentation of CE to EE merges	Yorick Peterse
	This updates the documentation of automatic CE to EE merges to cover the new automatic merging setup.
2018-11-23	Instruct against squashing in CE to EE MRs	Achilleas Pipinellis

2018-09-21	Correct grammar (setup to set-up) in Docs	Marcel Amirault

2018-09-06	Resolve "CE documentation is not CommonMark compliant"	Brett Walker

2018-08-07	Update git rerere link in docs	gfyoung
	The original link was moved.
2018-03-06	Docs guidelines: cherry-picking commits from CE to EE	Marcia Ramos

2018-02-01	Improve doc/development/automatic_ce_ee_merge.md	Rémy Coutable
	Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-01-19	doc: Spelling fixes	Ville Skyttä

2017-12-11	Remove a header level in the new 'Automatic CE->EE merge' doc	Rémy Coutable
	Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-12-06	Address Robert's and Axil's feedback	Rémy Coutable
	Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-12-05	Move the "Limit conflicts with EE" doc to "Automatic CE-> EE merge"	Rémy Coutable
	Signed-off-by: Rémy Coutable <remy@rymai.me>