Make merge request text after push clearer

The message to create a merge request after pushing a new branch was not clear. It is now clear that it is optional to create a merge request for the pushed branch.

Part of #21451

@markglenfletcher Could you merge this please?

@lsnn Thanks!

/cc @rymai

assigned to @rymai

Thanks @lsnn! Coud you please add a CHANGELOG entry?

added 1 commit

• 53e3c366 - Make merge request text after push clearer

Compare with previous version

assigned to @lsnn

added 1 commit

• 47469235 - Make merge request text after push clearer

Compare with previous version

added 2 commits

• 262f04f1 - Make merge request text after push clearer
• 0c723b3b - Merge branch '21451-change-merge-request-text-after-pushing-new-branch' of https…

Compare with previous version

keep getting merge conflicts, will look at it further later

added 23 commits

• 91f8bdcb - Fetch repositories with --prune option by default.
• f0937984 - Bump version to 4.0.3
• bdd2efdb - custom_hook: only execute hook if file is executable
• ecc05d5e - custom_hook: refactor to pull repo_path into class
• 5a2eeedb - custom_hook: add support for global custom hooks
• 41e5d30c - spec: add tests for global custom hooks
• c77b77ad - custom_hook: chain custom hooks
• 97f17143 - spec: updated tests to match current code
• ce8ab74a - remove no longer needed gitlab_init
• 9c0b9ac5 - use String.end_with? instead of regexp
• a29ee6e3 - avoid Dir.exists? duplication by moving the check to match_hook_files
• e220d7f4 - remove unused create_global_hooks
• 1fc6fe7b - improve wording by using successful instead of ok
• bd82081b - changelog entry
• 98cf6684 - move helpers to top
• 6db22798 - cleanup dirs in before to fixup aborted tests
• 42db0f51 - fix gl_id_test_hook
• d2821466 - spec/custom_hooks: cleanup helpers not to repeat repo path parameter
• d0ee9cbf - spec/custom_hook: ensure "before" does complete cleanup
• 6c92e793 - test gl_id_test_hook as global and as repo hook separately
• 3c8fddc4 - DRY: add helpers for expect hook calls
• e055ae75 - test expected hook order
• 4f3d88ba - changelog spelling

Compare with previous version

added 29 commits

• 4f3d88ba...e1b0aca1 - 25 commits from branch gitlab-org:master
• a8d6c6cc - Make merge request text after push clearer
• a1b087d6 - Make merge request text after push clearer
• 92808ef4 - changelog entry
• 9e8fe634 - Merge branch '21451-change-merge-request-text-after-pushing-new-branch' of https…

Compare with previous version

resolved all discussions

Had a lot of trouble rebasing and fixing merge conflicts. Something definitely went wrong along the way cause I ended up with a lot of extra commits in this branch that were already on master. Not sure how to fix this and squash my commits, if necessary.

Yeah, I think you rewrote the history so these are new commits but their changes are not shown in the MR diff since they're already in master.

@lsnn What you can do to fix that is simple:

1. Note the commit hash from your branch (we will need it after)

2. Create a new branch from master:

   $ git fetch origin master
   $ git checkout -b 21451-change-merge-request-text-after-pushing-new-branch-bis origin/master

3. Cherry-pick the good commit:

   $ git cherry-pick 47469235573a2f551bde2c4c9a398a1822adada2

4. Add your changelog entry in CHANGELOG

5. Stage the CHANGELOG update and amend the last commit

   $ git add CHANGELOG
   $ git commit --amend

6. Force-push to the original branch on the remote:

   $ git push --force-with-lease origin 21451-change-merge-request-text-after-pushing-new-branch-bis:21451-change-merge-request-text-after-pushing-new-branch

Hope that helps, let me know how it goes!

added 1 commit

• ed37021c - Make merge request text after push clearer

Compare with previous version

@rymai thanks a lot! I'm really fighting with --rebase and working from a fork, trying to get the hang of it

working from a fork

@lsnn Oh right, then you should replace origin with upstream or whatever name you gave for the canonical GitLab remote! ;)

Then changes look good now, thanks!

changed milestone to %8.15

mentioned in commit 8e370b37

merged