On Mon, 27 Jan 2020 at 15:08, Eric Barboni <[email protected]> wrote: > I want to do like you did as I think it's a good way to do. I'm not sure to > clearly understand the workflow in with git. It seems that you are using > directly the apache git and not a fork.
In terms of merging things (as opposed to testing) I generally did everything through the GitHub UI on the Apache repo. Merge release specific PRs to master, open a PR from master to release113 as soon as master is ahead, and merge it when you're ready to roll the next beta / vc. If I needed to fix something up I'd do it via PR from personal clone to master (occasionally release11x), rather than direct pushing to Apache repo. Same with the post-release tasks. btw, the reference I have at # or if you've disabled upstream push git push https://github.com/apache/netbeans.git $VERSION relates to the fact that I use git remote set-url --push upstream DISABLED - habit I got into ages ago with multiple remotes to guard against pushing to the wrong one! :-) No idea if anyone else does that. > Will try to document in the confluence page. To make it easy for future. Yes, it's something I wanted to touch base on. I didn't document because that was my way of doing things, rather than necessarily something that anyone else had done before. But it proved fairly easy and quick way to handle. Standardizing and updating documenting how we do it would be good, even if it ends up different. Best wishes, Neil --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
