Skip to content

DadoFlow Adding a Feature

Paul Mansour edited this page May 29, 2020 · 1 revision

Virtually all work gets done on feature branches. To fix a bug, make a minor enhancement, implement a new feature, clean up code, or refactor, create a feature branch using the NewFeatureBranch function:

      NewFeatureBranch 'my new feature'

Now write code to implement the feature or fix the bug, and commit the changes using the Commit function:

      Commit '' 

There is no need to provide a commit message here; AcreFlow will provide the default message "Save point". You may want to commit multiple times while implement your feature or fixing your bug.

When the feature is complete, merge the branch back into the master, providing a final commit message:

      MergeFeatureBranch 'final commit message here'

This squashes all the 'Save point' commits into a single commit, merges the branch back into the master, and then deletes the feature branch which is no longer needed.

Choose this message carefully; it will become a release note. You can prefix the message with a tilde (~) to omit the commit message from the release notes. This is useful for changes that users have no interest in:

      MergeFeatureBranch '~Cleanup and refactor widget code'