summaryrefslogtreecommitdiff
path: root/lib/api/files.rb
diff options
context:
space:
mode:
authorPradyumna <pradyumna2905@gmail.com>2018-08-29 21:50:00 -0700
committerPradyumna <pradyumna2905@gmail.com>2018-08-29 22:00:38 -0700
commit23f14e442cab09b3ebb9f2ba4f76a9272c8ff0e5 (patch)
tree7ad044fcd119f75c6bd14bb5e0c86bddff1690a1 /lib/api/files.rb
parentf981d4febbbb5103262f4daa858236d9c4ed9d67 (diff)
downloadgitlab-ce-23f14e442cab09b3ebb9f2ba4f76a9272c8ff0e5.tar.gz
Updates hint text for merging branches locally.
- Hint essentially states that a user should first update their target branch with upstream changes and then perform the merge.
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions