Hotfix Branches (Plugin)

You are here:
Estimated reading time: < 1 min


Find & Replace with yours:

  • {M.m.f} → Version.

1. Create

git checkout develop && git pull origin develop && git checkout master && git pull origin master && git flow hotfix start {name}

Where {name} is the hotfix branch name.

2. Add & Commit Files Changes

git commit add {path/to/file.ext};
git commit 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 hotfix finish {name};
Sólo usar el siguiente comando si se muestra el mensaje “There were merge conflicts”, tantas veces como aparezca el mensaje, máximo 9.
git commit -m "-" && git flow hotfix finish {name} -m "-"
Sólo usar el siguiente comando una vez que se muestre el mensaje “Summary of actions”.
git checkout master && git tag -a {M.m.f} -m - && git push origin develop && git push origin master && git push origin {M.m.f} && git checkout develop

Where {M.m.f} is the hotfix version and {name} is the hotfix branch name.

Use git describe --tags --abbrev=0 to see the last repository version.
What does {M.m.f} means?

See Semantic Versioning

Was this article helpful?
Dislike 0
Views: 72