WIP

Bootstrapping (need to be done only once)

You will not have write permission to github apache mirror, you need to
fork https://github.com/apache/incubator-netbeans to your own repositories.

You need to clone the forked repository and setup name and mail. This also may help git rebase to fullfil its task.

git config --global user.name "John Doe"
git config --global user.email "john@doe.org"

--global  can be removed if you want to setup only the current repository.

Uses branches

You now want to create a Pull Request for a fix or a new feature.Pull Request are not fixed in time. I you change your history the PR will be impacted.

 A PR will be reviewed by commiters and they may ask you additionnal work.To easy your work it's better to create a branches per feature you want to submit as Pull Request.

creating and pointing at  a new branch from master required 3 steps

1. git checkout master
2. git branch mywork
3. git checkout mywork

You can then code, commit and push to your forked repository. You can then use the github UI to create a Pull request from your branche

https://help.github.com/articles/creating-a-pull-request/

You will need an ICLA (Individual Contributor License Agreement) for important modifications.

Commit message related to JIRA issue must start with [NETBEANS-<issue number>]

Squashing commits on a Pull Request

Before submitting your Pull Request it should ideally consist of a single commit only.

<squashing: to be described ....>

Keeping your fork in sync with Apache GitHub repo

<to be described>

Updating a stale Pull Request

Over time your Pull Request is likely to go stale. A "stale" pull request is one that is no longer up to date with the main line of development, and it needs to be updated before it can be merged into the project.

<to be described :  possible link we can use: https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request>