Hi there,
I am struggling a bit with the new merging workflow from master to the
branches. I did a short read on the workspaces and tried cherry-picking
with and without workspaces. It seems workspaces are not for doing
actual commits that should at the end et pushed to origin. And when
using cherry-pick into a checked out 8.5.x branch I end up with a
detached head state.
Assuming commits that apply cleanly to the branches, what is the
proposed workflow?
Something like:
git checkout master
... apply changes ...
git add <files to commit>
git commit
git push
git checkout 8.5.x
????
git push
git checkout 7.0.x
????
git push
Any initial recommendations? I am talking here about simply short
commits that might not warrant creating a local branch (eg.
b5c4c30b8037b587b8804f1e6e764bbfd4ffb727). But that's probably
independent of the backport workflow.
Regards,
Rainer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
