toxiproxy icon indicating copy to clipboard operation
toxiproxy copied to clipboard

Separate development from master branch

Open xthexder opened this issue 9 years ago • 1 comments

Recently it seems there's been some issues and confusion over what versions are released and what documentation matches what.

Currently the master README.md is a bit of a mix between 2.0.0 documentation and upcoming 2.1.0 changes. I think it may be beneficial to move 2.1.0 development to a dev branch, so that master is always the most recent release, and has the corresponding documentation. This also makes staging README changes much easier for future releases.

Thoughts? @Sirupsen

xthexder avatar Oct 25 '16 16:10 xthexder

seems like a good idea. just be careful to restrict patches that go to master - but not to dev - to a minimum. otherwise you can end up in merge hell, if both dev and master accumulated significant changes.

Dieterbe avatar Oct 25 '16 18:10 Dieterbe