-
-
Notifications
You must be signed in to change notification settings - Fork 224
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #156 from neos/task/introduce-composer-patching
TASK: Introduce Composer-based patching
- Loading branch information
Showing
4 changed files
with
21 additions
and
2 deletions.
There are no files selected for viewing
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
13 changes: 13 additions & 0 deletions
13
Neos.EventSourcedNeosAdjustments/Patches/neos_neos-development-collection_ReadMe.patch
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git a/Readme.rst b/Readme.rst | ||
index 6a23c0bd24410ae72eb070ff7728a2d3a2be9ff0..47384e2419246b7063bffaf0bd4ceb5f4ad74cef 100644 | ||
--- a/Readme.rst | ||
+++ b/Readme.rst | ||
@@ -68,3 +68,8 @@ To switch the branch you intend to work on: | ||
.. note:: We use an upmerging strategy, so create all bugfixes to lowest maintained branch that contains the issue (typically the second last LTS release, which is 3.3 currently), or master for new features. | ||
|
||
For more detailed information, see https://discuss.neos.io/t/development-setup/504 and https://discuss.neos.io/t/creating-a-pull-request/506 | ||
+ | ||
+Patched Version | ||
+=============== | ||
+ | ||
+Note that this development collection was patched by the Event Sourced Neos Adjustments package (see: Packages/CR/Neos.EventSourcedNeosAdjustments/composer.patches.json) |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
{ | ||
"patches": { | ||
"neos/neos-development-collection": { | ||
"neos_neos-development-collection_ReadMe": "Packages/CR/Neos.EventSourcedNeosAdjustments/Patches/neos_neos-development-collection_ReadMe.patch" | ||
} | ||
} | ||
} |
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