Short term, I've cloned apache:master afresh, copied my new files to that, then committed it to a new branch in my own fork. No idea if that's the right thing to have done, but the PR is now live, at least!
>-----Original Message----- >From: TimH <t...@jti.uk.com.INVALID> >Sent: 12 October 2022 16:00 >To: dev@nuttx.apache.org >Subject: RE: [apache/incubator-nuttx] tools/configure.sh: Update USAGE for >custom out-of-tree boards (PR #7103) > >I have created 2 rst files to document out-of-tree custom boards, and also >how to manage custom apps both in and out of tree, and would like to submit >a PR. > >This will be the first time I have submitted a PR, and I'm fairly new to using >GIT >and I'm struggling to understand the (documented) workflow as I just can't >relate to it. > >Here is the history of my interactions with the repositories. > >1) I originally created a fork of the main incubator-nuttx repo, sometime back >in 2021, from the 10.1 release branch. >2) I have created various branches along the way and committed my changes >to my own forked repo >3) My current branch includes a merge of 11.0 RC2 >4) My "master" is 5000+ commits behind apache:master, not surprisingly >5) My current active branch is around 500 commits behind apache:master >6) I have not pulled/merged my own branch to my "master" as github says it >can't do an automatic merge. >5) I can't do a PR back to apache:master from my active branch because, um, it >confuses me! > >Can a Nuttx/GIT old-hand offer some guidance on how I get out of this >seeming muddle so I can get myself in a position to submit PRs? I have other >code I would like to contribute so have to get this sorted, but, equally, don't >want to mess up my ongoing development work by having to pulling in >"random" current patches from apache:master that might break what I'm >doing (i.e. I want to be in control of what master branch/release my work is >based on). > >Hope that makes sense?
