[Development] New branch in qtdoc for Qt 5.0 documentation brush-up

Stephen Kelly stephen.kelly at kdab.com
Fri Oct 5 14:36:12 CEST 2012

On Friday, October 05, 2012 09:15:48 Eskil Abrahamsen Blomfeldt wrote:
> On 10/04/2012 05:21 PM, Stephen Kelly wrote:
> > On Thursday, October 04, 2012 17:06:08 Eskil Abrahamsen Blomfeldt wrote:
> >> If
> >> you are working on changes to the qtdoc repository, could you please
> >> move it over to "newdocs" branch so we can minimize conflicts?
> > 
> > Excuse my circular logic, but if everyone should commit to newdocs and no
> > one should commit to master, let's delete the master branch entirely,
> > rename newdocs to master and work there instead. That way, we we're done
> > with this complicated branch issue before the newdocs branch was even
> > created.
> > 
> > In other words: Why create a branch at all?
> This is most likely just poor communication on my part.
> The "newdocs" branch is a topic branch where we can break the current
> documentation without delaying the next beta. If you have changes that
> need to go into the beta, they can be put in the master branch and we
> will deal with any potential conflicts when they appear, but if they do
> not, and especially if you are participating in the Qt 5 documentation
> clean-up, it would be great if you could commit to "newdocs" so we
> working against the same version of the code.
> The main conflicts we're worried about now is work on pages that are
> deleted in the new structure for instance or duplicate work, which would
> become much more visible if everyone working to make the Qt 5
> documentation great are on the same branch.
> The branch will go away and be merged into master once its contents are
> considered usable, so this is in no way meant to be a permanent
> solution. Hopefully that will not take too long.

I see, thanks for the clarification.

Stephen Kelly <stephen.kelly at kdab.com> | Software Engineer
KDAB (Deutschland) GmbH & Co.KG, a KDAB Group Company
www.kdab.com || Germany +49-30-521325470 || Sweden (HQ) +46-563-540090
KDAB - Qt Experts - Platform-Independent Software Solutions
** Qt Developer Conference: http://qtconference.kdab.com/ **
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.qt-project.org/pipermail/development/attachments/20121005/18d87647/attachment.sig>

More information about the Development mailing list