Document git workflow with new 'next' and 'fixes' branches #497
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Create a new file src/doc/git-workflow.md that explains how our git workflow serves users, contributors, application developers, and maintainers. Update branches.md with two new branches that facilitate this: next and fixes.
|
I am pushing an update that expands the content and revises the language a bit. |
Spell out the activities that contribute to Snabb Switch maintenance.
Revise the description of how to submit a change. Emphasise that the
goal is to land the change on a branch that somebody is going to merge
with master and once that is done you can mostly relax. (You don't
have to push your change for a whole month until it lands in a release
- only until somebody else merges it onto a branch that they are going
to push upstream.)
Rephase from role-oriented ("Casual users should do this") to
task-oriented ("How to download the latest release"). Ideally
everybody will be a user, developer, and maintainer to varying
extents.
lukego
added a commit
to lukego/snabb
that referenced
this pull request
May 28, 2015
wingo
pushed a commit
to wingo/snabb
that referenced
this pull request
Oct 20, 2016
Define skipped code in SnabbVMX's nexhop test
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Define a new Git workflow that is supposed to make life easier for users, contributors, application developers, and maintainers. Specifically aim to keep
masterstable for users and application developers and create a newnextbranchI know everybody surely has "git workflow fatigue" by now. Sorry. This is an attempt to solve an important problem: relieve the tension between providing a stable base and quickly bringing in new code for wider testing. I am not satisfied with the old workflow of landing individual new changes directly on master: it creates an awkward compromise of somewhat stable code landing at a somewhat reasonable pace.
@eugeneia and I will have to work out how to properly fit this into the release workflow.