Merge ours for CSS and JS files, merge theirs for CHANGELOG.md. Added image processing command and dependencies in composer.json. #15
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
… image processing command and dependencies in composer.json.
…les for code formatting and style. This will ensure consistent code style across the project and improve code readability.
fuelviews-app bot
pushed a commit
that referenced
this pull request
Dec 20, 2024
… image processing command and dependencies in composer.json. (#15) * Merge ours for CSS and JS files, merge theirs for CHANGELOG.md. Added image processing command and dependencies in composer.json. * Fix styling * Add PHP-CS-Fixer configuration file to the project, which includes rules for code formatting and style. This will ensure consistent code style across the project and improve code readability. * Fix styling * Fix styling * Fix styling * Fix styling --------- Co-authored-by: thejmitchener <[email protected]>
thejmitchener
added a commit
that referenced
this pull request
Dec 20, 2024
… image processing command and dependencies in composer.json. (#15) * Merge ours for CSS and JS files, merge theirs for CHANGELOG.md. Added image processing command and dependencies in composer.json. * Fix styling * Add PHP-CS-Fixer configuration file to the project, which includes rules for code formatting and style. This will ensure consistent code style across the project and improve code readability. * Fix styling * Fix styling * Fix styling * Fix styling --------- Co-authored-by: thejmitchener <[email protected]>
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.
Pull Request Description: Merge ours for CSS and JS files, merge theirs for CHANGELOG.md. Added image processing command and dependencies in composer.json.
Motivation
This pull request addresses two main objectives: ensuring that our CSS and JavaScript files maintain consistency during merges, and enhancing our application's image processing capabilities. By merging "ours" for CSS and JS files, we protect our custom styles and scripts from being overwritten during merges. The decision to merge "theirs" for
CHANGELOG.mdensures that the latest updates and changes from other contributors are accurately reflected in our documentation.Additionally, this PR introduces new dependencies for image processing in the
composer.jsonfile, enabling us to optimize images efficiently. The inclusion of an image processing command enhances our development workflow by providing a straightforward method to unify naming conventions, fix file extensions, and optimize images within thepublic/images/folder.Improvements
Merge Strategy:
CHANGELOG.mdwill merge "theirs", ensuring we capture all relevant updates from collaborators.Image Processing Capabilities:
intervention/imageandspatie/image-optimizerdependencies, allowing for robust image manipulation and optimization.app-init:images, which streamlines the process of:Documentation Update:
README.mdto include instructions for processing images, ensuring that developers are aware of the new capabilities and how to utilize them effectively.This PR significantly enhances our project's ability to manage CSS and JS files while also providing essential tools for image optimization, which is crucial for maintaining an efficient and performant application.