Skip to content

Conversation

@oadultradeepfield
Copy link
Contributor

Description

Following the discussion in git-mastery/exercises#68, it was suggested that the implementation of the merge step in this repository (repo-smith) was initially created to support early exercises and might not be fully complete.

To support the implementation of the exercise T6L2/merge-squash, the merge step in repo-smith should now allow squash merges in addition to the existing fast-forward option.

Changes Made

  1. Added a new boolean parameter squash to the MergeStep data class, enabling squash merge functionality alongside the original --no-ff option. When squash is set to True, an additional step is performed to commit the merged changes.
  2. Updated the RepoInitializer class to initialize the merge step with the new squash parameter.

@woojiahao woojiahao self-requested a review November 12, 2025 03:15
@woojiahao woojiahao self-assigned this Nov 12, 2025
Copy link
Member

@woojiahao woojiahao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you do a bump on the version in pyproject.toml? This would be a minor release. I'll publish once this is merged. Thank you!

I will likely be updating the CI to autopublish when a tagged release is made, but for now, we need to manually bump the dependency

Copy link
Member

@woojiahao woojiahao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@woojiahao woojiahao merged commit e6749b8 into git-mastery:main Nov 12, 2025
@oadultradeepfield oadultradeepfield deleted the feat/add-squash-to-merge-step branch November 12, 2025 03:30
@woojiahao
Copy link
Member

@oadultradeepfield the version has been published, could you run pip install -r requirements.txt -U --no-cache-dir in the exercises repository and verify that version 0.11.0 is installed? That should contain your fix

@oadultradeepfield
Copy link
Contributor Author

oadultradeepfield commented Nov 12, 2025

@oadultradeepfield the version has been published, could you run pip install -r requirements.txt -U --no-cache-dir in the exercises repository and verify that version 0.11.0 is installed? That should contain your fix

@woojiahao Yes, the current version is now 0.11.0. Thanks!

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.

2 participants