Addressing Port submission failures on Travis
mojca at macports.org
Wed Dec 20 09:04:20 UTC 2017
On 20 December 2017 at 09:04, Ken Cunningham wrote:
> keep the master branch up to date, but leave your PR branch alone until it's merged, then delete the branch.
Indeed, that's the correct advice. You only ever need one single fork
of macports-ports, but make sure to always keep the master branch 100%
clean (in sync with upstream) and then make a new branch for each PR.
If you PR needs an update, you push all the changes to that branch and
that will be properly reflected in the PR. You can even force push to
fix mistakes in the initial commit or after "git rebase master" etc.
You cannot have a single branch for multiple PRs, but more important:
if you modify the master branch, you'll run in all kinds of troubles
when merging/rebasing etc., so just remember the rule of one branch
Sometimes people close a PR and open a new one just to fix mistakes.
This is not needed either as one can simply update the branch and the
PR will properly reflect that.
More information about the macports-dev