FlorianHockmann commented on PR #1941: URL: https://github.com/apache/tinkerpop/pull/1941#issuecomment-1383647445
> I made the changes from master, which I now see is pretty far from apache:3.5-dev. Should I have started from 3.5-dev in the first place? That would be ideal, yes. I guess the easiest way now is to do a soft reset of your commit, stash it and then (hard) reset your branch on `3.5-dev`. After that, it should be easy to apply your changes from the stash and commit it again. Lastly, you can force push your branch which should let this PR end up clean with just one commit that should be merged into `3.5-dev`. If you need help with that, just say so. Our branching strategy is that non-breaking changes, and especially bug fixes, should target the lowest release branch still supported. This is `3.5-dev` right now. We will then merge it into that branch and afterwards merge it into the other release branches (`3.6-dev` and `master`) so it ends in all upcoming releases. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
