Thanks, your method helps. It is almost the same as my second method, except that I don't have to deal with merging upstream to my origin. Do you also have a problem with pushing to a branch directly working on the apache/netbeans that cause you to use that "fork" method?
On Mon, Feb 24, 2020 at 2:56 PM Matthias Bläsing <[email protected]> wrote: > > Hi, > > Am Montag, den 24.02.2020, 14:45 -0500 schrieb Nam Nguyen: > > I was now able to use the web browser to edit a file, and submit a > > pull request. Not the best way. > > No - and the PR can't be merged like this, as your Name is not > correctly recorded in the commit. Please check your github settings, > github makes it hard to work with it sanely. I strongly recommed to > stick with "real" clients and configure them correctly. > > > Another way is creating a netbeans repository using my own account > > cloning from the original one (apache/netbeans). I then can push my > > changes locally up there. I think I can then create a pull request > > there to the upstream. But that would leave me constantly merging > > upstream to my remote branch. > > I do it like this: > > 1. Fork the netbeans repository with the github GUI > 2. Clone that fork locally: git clone [email protected]:<username>/netbeans.git > 3. Add a second remote to the repository: git remote add upstream > https://github.com/apache/netbeans.git > > Now for every fix you want to make, run: > > 1. Update your local copy of upstream: git fetch upstream > 2. Create a working branch from upstream master: git checkout -b > fix_mighty_problem upstream/master > 3. Do the fixes you want to do and commit them (potentially multiple fixes) > 4. Push the new branch to your github repository: git push -u origin > fix_mighty_problem > 5. Go to the github GUI and create a PR from that branch > > -> done > > If the PR is not perfect and needs further work, you can switch back to that > branch: > > 1. Checkout the branch: git checkout fix_mighty_problem > 2. Do the fixes you want to do > 3. Push the updates to github: git push > > -> done again > > HTH > > Matthias > > > --------------------------------------------------------------------- > 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 > > > --------------------------------------------------------------------- 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
