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
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