Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added doc/branches.md: List of active development branches #485

Merged
merged 1 commit into from
May 16, 2015

Conversation

lukego
Copy link
Member

@lukego lukego commented May 16, 2015

branches.md serves three purposes:

  • Help users find out what branches exist.
  • Help developers advertise their branches.
  • Help to automatically sync branches onto the SnabbCo repository.

The Github SnabbCo/snabbswitch branches page shows the current status of all these branches with respect to master. Users should automatically receive all branches when pulling from the main repository.

This is intended to help new long-lived branches to be used and develop features that can synchronize with master and other branches over time.

Notes:

  • There is currently a small cronjob using this file to automatically push changes from known branches onto the master repository.
  • If you are the maintainer of a known branch then your pushes will automatically be synced.
  • The sync is done without --force so rebases are not supported without manual intervention. The intended workflow is that the branches pull from master (and each other) and not rebase.

Let this wild experiment begin! :-)

The file serves three purposes:

- Help users find out what branches exist.
- Help developers advertise their branches.
- Help to automatically sync branches onto the SnabbCo repository.

Github provides an automatic summary of the current state of all these
branches on the [SnabbCo/snabbswitch
branches](/~https://github.com/SnabbCo/snabbswitch/branches/all) page.

This is intended to help new long-lived branches to develop features
and synchronize with master and other branches over time.
@lukego
Copy link
Member Author

lukego commented May 16, 2015

I will mail snabb-devel with more about this idea soon...

lukego added a commit to lukego/snabb that referenced this pull request May 16, 2015
@lukego lukego merged commit 638c3e0 into snabbco:master May 16, 2015
@lukego lukego deleted the branches branch June 10, 2015 08:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant