...
Resolve the conflicts if exist. Test with the merged code so that it does not break the system. FinallyThen, check that Apache headers are in place where needed, by running RAT:
| Code Block | ||
|---|---|---|
| ||
$ mvn apache-rat:check |
Finally, as a courtesy to the merger, you can rebase to master and squash all the commits from your PR into one:
| Code Block | ||
|---|---|---|
| ||
# Rebase
$ git rebase -i upstream/master |
In the rebase process, make sure that the contribution is squashed to a single commit. From the list of commits, "pick" the commit in the first line (the oldest), and "squash" the commits in the remaining lines:
| Code Block | ||
|---|---|---|
| ||
pick 7387a49 Comment for first commit
squash 3371411 Comment for second commit
squash 9bf956d Comment for third commit |
Chapter 3 and Chapter 7 of the Git Book contains lots of information on what this means.
5. Push commits into the your remote repo (forked)
...