[semver:minor] Fix merge-with-parent, part 2 - Githubissues

CircleCI-Archived / build-tools-orb

An orb with handy tools for use in CircleCI jobs

https://circleci.com/developer/orbs/orb/circleci/build-tools

MIT License

8 stars 9 forks source link

[semver:minor] Fix merge-with-parent, part 2 #32

Closed akx closed 3 years ago

akx commented 3 years ago

Checklist

[x] All new jobs, commands, executors, parameters have descriptions
[x] Examples have been added for any significant new features
[x] README has been updated, if necessary

Motivation, issues

This should fix #31, so non-fast-forward merges work even when no-commit (added in #28) is not set.

It also fixes a typo (detatched) from #28.

Description

Add -m "merge-with-parent" to merge-with-parent's merge command, so it does not die when there is no EDITOR available.
Fix detatched typo.