Hi Eric,
Am Samstag, den 07.03.2020, 12:08 -0600 schrieb Eric Bresie: > Okay...I'm trying to do so (would be my first push by the way), but I think > my git/github PR inexperience may be coming in to play here... > > This is I believe for https://github.com/apache/netbeans/pull/2007 or more > specifically > https://github.com/apache/netbeans/pull/2007/commits/5e7ce9bb83e73801b48c2261c170b91fb889eb0b > > but I seem to have extra "commits" included with the PR that I didn't mean > to include in any way. > > Over time I've creating "commits" on my fork to keep up to date with > changes against the master apache/netbeans fork and now they shows all > those extra commits. I'm not sure how to exclude all those and just have > the one commit with the actual changes and avoid polluting the history with > those (which were already covered by the original submitters) > > I assume this is a "rebase" or "squash" type action needed to be done but > I'm not sure how to do that with github. please have a look at this email: https://lists.apache.org/thread.html/rf4e83cb43d7026af2bc37235623980d59afbc230ce66713ba92ccb9f%40%3Cdev.netbeans.apache.org%3E that should get you going. The TL;DR version: - Create a local branch based on the upstream master (whether cloned from gitbox or github does not matter) - Add your changes to this branch (cherry-picking can help porting existing work) - Push that branch to a public repository (github is the common location) Create a PR based on that public repositories branch. On github you can use the build in PR facility, if the repository is not on github, you'll need to use plain e-mail with a reference. 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
