The Aha moment has arrived - You got - What is your github name? -----Original Message----- From: Nathan Hartman [mailto:hartman.nat...@gmail.com] Sent: Tuesday, December 24, 2019 12:28 PM To: dev@nuttx.apache.org Subject: Re: Software release life cycle choices could have implications on workflow (was RE: Single Committer)
On Tue, Dec 24, 2019 at 3:15 PM Gregory Nutt <spudan...@gmail.com> wrote: > > >> Also, is there a way to take a PR against master and apply it as a > >> branch? > > > > I generally do that by taking the PR as a patch, then applying the > > patch on a branch. > > > > But it looks like you can do that with github: > > > https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/changing-the-base-branch-of-a-pull-request > > > We will need to experiment with that, but if it works then we could > continue to use the dev branch with no PR problems. If we get a PR on > master, we could just change the base to dev. > > That, of course, depends on keeping dev fairly clean and freshly rebased > to master. If things are going to linger on dev, we should move them to > another branch. Git's claim to fame is supposed to be the cheapness of branches. What if each PR becomes its own branch and then it either: (a) gets worked on, (b) applied to master, or (c) deleted? Nathan
