Allow squash merge in the merge step #2
Merged
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.
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 inrepo-smithshould now allow squash merges in addition to the existing fast-forward option.Changes Made
squashto theMergeStepdata class, enabling squash merge functionality alongside the original--no-ffoption. Whensquashis set toTrue, an additional step is performed to commit the merged changes.RepoInitializerclass to initialize the merge step with the newsquashparameter.