Hi, > I checked in the bug fixes I was working on. Are you going to do a big > merge at the end or should we merge each change to release4.12.0 to > develop as we go? Any changes in release need to be merged back into develop as there where our tests run. IMO our branching is a little pointless, as we only test develop (not the release branch) and have a trunk/master than never been tested and no one builds from.
Changes to TLF don't require merging as such. Thanks, Justin