Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: Removed no-ff flag

...

Now assuming that you are done with the feature you're working on and want to bring your changes into the main develop branch so that you can issue a pull request.  Now:

git merge --no-ff my-feature
git branch -d myfeature # remove the now useless branch

...