FRW-9645 nonsplit to split merge #1670
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
FRW-9645 Enable feature development.
…ster-feature-module-ssp # Conflicts: # buddy.yml # src/Pyz/Zed/Glossary/GlossaryConfig.php # src/Pyz/Zed/Router/RouterConfig.php # src/Pyz/Zed/SearchElasticsearch/SearchElasticsearchConfig.php
composer.lockPackage changes
Dev Package changes
Settings · Docs · Powered by Private Packagist |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Auto created via release app as upgrade check for releasing. @asmarovydlo
Please check if merge conflicts have been resolved correctly, and then manually merge once all is confirmed and Travis is green.
Important: As part of the auto-release (and nonsplit to split merge functionality), this PR must NOT be merged using "squash".
Please make sure to use normal merge ("Create merge commit") if done manually.
Overview
Git Merge Conflict Details:
On branch feature/ae-147/master-feature-module-ssp
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
Changes to be committed:
modified: config/Shared/config_default.php
new file: src/Pyz/Zed/DocumentationGeneratorRestApi/Business/DocumentationGeneratorRestApiBusinessFactory.php
new file: src/Pyz/Zed/DocumentationGeneratorRestApi/Business/Finder/GlueControllerFinder.php
modified: tests/PyzTest/Zed/Console/_data/cli_sandbox/config/Shared/config_default.php
renamed: tests/travis_check_touched_modules.sh -> tests/ci_check_touched_modules.sh
renamed: tests/travis_check_untracked.sh -> tests/ci_check_untracked.sh
modified: tests/touched_modules_list.sh
Unmerged paths:
(use "git add/rm ..." as appropriate to mark resolution)
deleted by us: buddy.yml
deleted by us: src/Pyz/Zed/Glossary/GlossaryConfig.php
deleted by us: src/Pyz/Zed/Router/RouterConfig.php
deleted by us: src/Pyz/Zed/SearchElasticsearch/SearchElasticsearchConfig.php