Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make PR merge options more intuitive #16582

Merged
merged 4 commits into from
Aug 2, 2021
+4 −4
Merged

Make PR merge options more intuitive #16582

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
81769c8
Make PR merge options more intuitive (#5863)
aaribaud Jul 30, 2021
0daf6bd
Merge branch 'main' into reword-pr-merge-options
techknowlogick Jul 31, 2021
d9a8ee8
Merge branch 'main' into reword-pr-merge-options
lafriks Aug 2, 2021
2258128
Merge branch 'main' into reword-pr-merge-options
zeripath Aug 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions options/locale/locale_en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1437,10 +1437,10 @@ pulls.no_merge_helper = Enable merge options in the repository settings or merge
pulls.no_merge_wip = This pull request can not be merged because it is marked as being a work in progress.
pulls.no_merge_not_ready = This pull request is not ready to be merged, check review status and status checks.
pulls.no_merge_access = You are not authorized to merge this pull request.
pulls.merge_pull_request = Merge Pull Request
pulls.rebase_merge_pull_request = Rebase and Merge
pulls.rebase_merge_commit_pull_request = Rebase and Merge (--no-ff)
pulls.squash_merge_pull_request = Squash and Merge
pulls.merge_pull_request = Create merge commit
pulls.rebase_merge_pull_request = Rebase then fast-forward
pulls.rebase_merge_commit_pull_request = Rebase then create merge commit
pulls.squash_merge_pull_request = Create squash commit
pulls.merge_manually = Manually merged
pulls.merge_commit_id = The merge commit ID
pulls.require_signed_wont_sign = The branch requires signed commits but this merge will not be signed
Expand Down