[Qt-jambi-interest] Should I merge the build branch into the master branch?

[Helge Fredriksen]

Fracis,

I'm quite a newbie to git, could you give me some hints
on how to pull your changes from the build branch?

I did a

git checkout --track -b build and a
git-pull

on the default clone on the community-port-to-4_6 repo,
but there were some complaints from git about some
missing merge branch. Please advise.


Regards,
Helge Fredriksen

I honestly wasn't aware that these were not in the master
branch....

Francis Galiegue wrote:
> I haven't had any real feedback on the build branch so far, but I know
> that it works fine with the current qt git branch (I have merged
> Helge's changes into my branch).
>
> It requires ant-contrib, unlike before. I have no real knowledge of
> the qt-jambi "population" for now. My changes have been live for a few
> months, and have been tested by me but little else. What should I do?
>
> Should I get more people to test the build branch? Or shoulld I just
> go with it and "push" all of my changes into the master branch? Either
> solution makes me feel uneasy: the first solution because it requires
> some knowledge of git; the second because if there are glaring bugs
> that I have not encountered, they will be, rightly so, considered as
> regressions. Not that regressions are really a problem with git, see
> "git help bisect".
>
> But I want the majority to agree. Please tell me. I, of course, would
> prefer the second solution...
>
>