On Thu, Feb 28, 2019 at 6:10 AM Emmanuel Bourg <ebo...@apache.org> wrote:
> Le 28/02/2019 à 11:47, Rainer Jung a écrit : > > Thanks a bunch. Looks like what I was searching for, will try it. > > > > Rainer > > You could play with a single repository too: > +1, that's what I do. > > # Initial setup > cd ~/repos > git clone g...@github.com:apache/tomcat.git > > # Commit... > cd ~/repos/tomcat > # edit files > git commit -a -m "Some message" > git push > > # ...and backport > git checkout 8.5.x > git cherry-pick <hash> > git push origin 8.5.x > > git checkout master > Sometimes I also create a local branch to do the work in so that I don't have to worry about putting everything in one commit from the start. After I'm done with the bug/feature, then I squash that whole local branch into one commit and merge it into master (or whatever branch). From there you can cherry-pick that single commit to wherever it's needed. > > Emmanuel Bourg > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
