branches and merging and pull requests

[andrew-elder]

What is the pull request policy for this repo? ie what branch should pull requests be made to?

We should add something to the top level readme describing how to contribute to the repo.

[aguedes]

Since this project is in its early days, I think we should keep the PR policy as simple as possible for now. PRs should target 'master' branch. Once the PR gets Travis and code review "green light", we merge it using the option "rebase and merge", preferably.

[andrew-elder]

@aguedes - pull requests to master are fine for the moment.

[andrew-elder]

I'm going to close this issue.

[aguedes]

Hey @andrew-elder, could we please use the "rebase and merge" button when applying PRs into master branch?

The current approach creates a merge commit every time a PR is applied, resulting in a spaghetti-ish git history. The rebase-and-merge approach gives us a linear history, much easier to make sense out of it.

[andrew-elder]

Yes. No problem. Previous major contributors to OpenAvnu preferred merging without rebasing, but this repo is contributed by others so I’m happy to follow their wishes.