1. Create
git pull origin develop && git flow feature start {featureName}
Where {featureName} is the feature branch name.
2. Add & Commit Files Changes
git add {path/to/file.ext};
git add {path/to/file2.ext};
git commit -m "{changesDescription}"
Where:{path/to/file.ext} and {path/to/file2.ext} are the files to add.{changesDescription} are the changes description.
3. Finish
git flow feature finish {featureName}
Sólo usar el siguiente comando si se muestra el mensaje “There were merge conflicts”.
git commit -m "-" && git flow feature finish {featureName}
Where {featureName} is the feature branch name you created.