Marcel Amirault 66d17c5430 Update squash_and_merge.md to fix link and description ... (cherry picked from commit b5ea33397eb8d2c874662026b0e36aed7c41dbbc)		2018-06-22 12:06:36 +02:00
..
img	Rephrase "maintainer" to more precise "members who can merge to the target branch"	2018-06-01 14:33:12 +09:00
allow_collaboration.md	Rephrase "maintainer" to more precise "members who can merge to the target branch"	2018-06-01 14:33:12 +09:00
authorization_for_merge_requests.md	Doc update	2018-06-06 21:01:43 +09:00
cherry_pick_changes.md	Update a bunch of docs images	2017-10-04 15:47:59 +02:00
fast_forward_merge.md	Backport 'Rebase' feature from EE to CE	2018-01-05 09:34:59 +01:00
index.md	Doc update	2018-06-06 21:01:43 +09:00
maintainer_access.md	Rephrase "maintainer" to more precise "members who can merge to the target branch"	2018-06-01 14:33:12 +09:00
merge_request_discussion_resolution.md	Refactor Discussions docs	2017-04-21 19:35:23 +02:00
merge_when_build_succeeds.md	Move MWPS document to new location	2016-11-29 11:35:30 +01:00
merge_when_pipeline_succeeds.md	Update occurrences of MWBS to MWPS	2017-03-01 12:02:02 +01:00
resolve_conflicts.md	Make it explicit that merge conflict feature commits to source branch	2018-05-21 11:36:54 -07:00
revert_changes.md	Update a bunch of docs images	2017-10-04 15:47:59 +02:00
squash_and_merge.md	Update squash_and_merge.md to fix link and description	2018-06-22 12:06:36 +02:00
versions.md	Move merge requests index file inside the merge_requests dir	2017-02-13 10:22:00 +01:00
work_in_progress_merge_requests.md	Add blurb about changing MRs to WIP through commits	2018-02-04 20:45:14 -02:00