* Pull request options migration and UI in settings
* Add ignore whitespace functionality
* Fix settings if pull requests are disabled
* Fix migration transaction
* Merge with Rebase functionality
* UI changes and related functionality for pull request merging button
* Implement squash functionality
* Fix rebase merging
* Fix pull request merge tests
* Add squash and rebase tests
* Fix API method to reuse default message functions
* Some refactoring and small fixes
* Remove more hardcoded values from tests
* Remove unneeded check from API method
* Fix variable name and comment typo
* Fix reset commit count after PR merge
@ -755,7 +755,12 @@ pulls.is_checking = "The conflict checking is still in progress; please refresh
pulls.can_auto_merge_desc=This pull request can be merged automatically.
pulls.cannot_auto_merge_desc=This pull request cannot be merged automatically because there are conflicts.
pulls.cannot_auto_merge_helper=Please merge manually in order to resolve the conflicts.
pulls.no_merge_desc=This pull request can not be merged as no merge options are enabled.
pulls.no_merge_helper=To merge this pull request enable at least one merge option in repository settings or merge pull request manually.
pulls.merge_pull_request=Merge Pull Request
pulls.rebase_merge_pull_request=Rebase and Merge
pulls.squash_merge_pull_request=Squash and Merge
pulls.invalid_merge_option=You can not use this merge option for this pull request
pulls.open_unmerged_pull_exists=`You cannot perform reopen operation because there is already an open pull request (#%d) from same repository with same merge information and is waiting for merging.`
milestones.new=New Milestone
@ -894,6 +899,10 @@ settings.tracker_url_format_desc = You can use placeholder <code>{user} {repo} {
settings.enable_timetracker=Enable time tracker
settings.allow_only_contributors_to_track_time=Allow only contributors to track time
settings.pulls_desc=Enable pull requests to accept public contributions
settings.pulls.ignore_whitespace=Ignore changes in whitespace when checking conflicts