summaryrefslogtreecommitdiff
path: root/lib/api/files.rb
diff options
context:
space:
mode:
authorJohann MacDonagh <johann.macdonagh@gmail.com>2014-02-08 21:47:20 -0500
committerJohann MacDonagh <johann.macdonagh@gmail.com>2014-02-08 22:15:44 -0500
commit88d397f473a40236c7a03a7acf924a3640e70d9c (patch)
tree75f542bfc6be8eae6500c791571f8b757b38fddd /lib/api/files.rb
parent54b892153440935a08e00c63db3ec8a607ae3565 (diff)
downloadgitlab-ce-88d397f473a40236c7a03a7acf924a3640e70d9c.tar.gz
Instruct users to fetch merge request branch
Instructing users to create a new branch on the target branch and then pulling creates a few issues. If the target branch has moved on since the source branch diverged from it, then the pull will create an unnecessary merge commit from the target branch to the source branch. If the user has pull.rebase set to "true" or "preserve", then this creates an even stranger history. These instructions will ensure the local branch created for the merge request is exactly what contributing user has pushed.
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions