Bas-Man's Musings
  • Home
  • Categories
    Series Categories Tags
  • Projects
    GitHub Line Notification
  • Docs
    Bind DNS Setup Gmail & Zapier
  • References
    Python Perl Rust Git LaTeX
  • Snippets
    Python Perl Rust Git C++ Routers General
  • About

hotfix


Merge a hot fix from Master back into Dev branch

 Posted on December 14, 2020  |  1 minutes  |  23 words  |  Bas-Man

Taken from Stack Overflow https://stackoverflow.com/questions/7175869/managing-hotfixes-when-develop-branch-is-very-different-from-master

Take all commits to master and merge them back in to development

git checkout devel
git rebase master
git  hotfix  rebase  merge 

Bas-Man  • © 2020 - 2021  •  Bas-Man's Musings

Hugo v0.93.2 powered  •  Theme Beautiful Hugo adapted from Beautiful Jekyll

Privacy | Contact

By using this site, you agree to our use of cookies. We use cookies on this website to give you the best experience on our site. To find out more, read our privacy policy.