buster-docs: pull requests for branch master or rather develop only?

20 views
Skip to first unread message

m.k...@sprax.eu

unread,
Dec 29, 2012, 1:36:47 PM12/29/12
to buster...@googlegroups.com
Hi there,

firstly: Sphinx-based docs are a big improvement, great work!

Now my question is this: 
as I understand, the develop branch is meant to receive updates that apply to the next release while master is about the current one. 
So, I figure, when I have improvements that generally apply to both branches like e.g. spelling corrections - I'd send a pull request for master rather than for develop.

Right?

m.k...@sprax.eu

unread,
Dec 29, 2012, 1:44:38 PM12/29/12
to buster...@googlegroups.com, m.k...@sprax.eu
Just asking because I saw this improvement which falls into the "general" category but was merged into the develop branch only.

Christian Johansen

unread,
Jan 2, 2013, 2:48:20 AM1/2/13
to m.k...@sprax.eu, buster...@googlegroups.com
Hi,

I guess that commit really should have been merged to master, as it is
an improvement that is valid for the existing code-base as well. So,
yes, "general" improvements should be filed against master.

Happy new year :)

Christian

m.k...@sprax.eu writes:

> Just asking because I saw this improvement<https://github.com/busterjs/buster-docs/commit/06c5a51df99c1a7b04a674ae95fd4ad542a078f3> which

m.k...@sprax.eu

unread,
Jan 2, 2013, 3:17:45 PM1/2/13
to buster...@googlegroups.com, m.k...@sprax.eu, chri...@cjohansen.no
Ok, thx. Here's one: https://github.com/busterjs/buster-docs/pull/8

And a very Happy New Year to all ya busters ;)

Christian Johansen

unread,
Jan 3, 2013, 1:59:54 AM1/3/13
to m.k...@sprax.eu, buster...@googlegroups.com
Thanks, commented!

m.k...@sprax.eu writes:

> Ok, thx. Here's one: https://github.com/busterjs/buster-docs/pull/8
>
> And a very Happy New Year to all ya busters ;)
>
> Am Mittwoch, 2. Januar 2013 08:48:20 UTC+1 schrieb Christian Johansen:
>>
>> Hi,
>>
>> I guess that commit really should have been merged to master, as it is
>> an improvement that is valid for the existing code-base as well. So,
>> yes, "general" improvements should be filed against master.
>>
>> Happy new year :)
>>
>> Christian
>>

m.k...@sprax.eu

unread,
Jan 3, 2013, 1:32:54 PM1/3/13
to buster...@googlegroups.com, m.k...@sprax.eu, chri...@cjohansen.no
Worked in your corrections.

From IRC I could tell that Dec 21st/22nd weren't the best of days as it seems... But not much more.

Just let me know if you think of something more appropriate for changelog.rst
__
meisl
Reply all
Reply to author
Forward
0 new messages