Skip to content

Conversation

@joostdekeijzer
Copy link

@joostdekeijzer joostdekeijzer commented Aug 24, 2023

Description

Added composer.json file to make installation of PHP dependencies easier.

Just run composer install or composer update.

Type of change

Please delete options that are not relevant.

  • [] Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • [] Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

Tested on my local macOS machine with PHPv80

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules
  • I have checked my code and corrected any misspellings

@userjack6880 userjack6880 changed the base branch from version-1 to version-2-dev February 21, 2024 21:04
@joostdekeijzer
Copy link
Author

@userjack6880 thanks for approving, do you expect anything from me at this point?

@cweiske
Copy link

cweiske commented Oct 7, 2025

Could you rebase against master, @joostdekeijzer ?

@joostdekeijzer
Copy link
Author

Hi @cweiske,

I can't find any master branch on github. I can only see "version-1", "version-1-breakfix" and "version-2-dev"...

@cweiske
Copy link

cweiske commented Oct 8, 2025

Then rebase against whatever version you used as base for your development :)
The commit list here in this pull request has too many commits. Maybe you selected the wrong base branch?

@joostdekeijzer joostdekeijzer changed the base branch from version-2-dev to version-1 October 8, 2025 08:42
@joostdekeijzer
Copy link
Author

joostdekeijzer commented Oct 8, 2025

I see.

My original PR was against "version-1" but I see @userjack6880 changed the "base" branch to "version-2-dev". I think the extra commits originate from that.

I've changed the "base" branch back to "version-1" again. I can create a new PR for "version-2-dev".

Is 2 commits OK for you or should I "squash" it?

@cweiske
Copy link

cweiske commented Oct 8, 2025

Multiple commits make sense when they target different areas or features. If one commit is just a fixup for a previous one, then both should be squashed into one.

@joostdekeijzer
Copy link
Author

I'll squash, hold on (while I Google ;)

@cweiske
Copy link

cweiske commented Oct 8, 2025

git rebase -i HEAD^^

and then in the editor say "f" to the second.

@joostdekeijzer
Copy link
Author

thnx!
I did git reset --soft HEAD~2...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants