[Libreoffice] merge issues ...

[Jan Holesovsky]

Hi Bjoern,

On 2011-05-31 at 16:49 +0200, Bjoern Michaelsen wrote:

> > was pushed to both master and libreoffice-3-4, but the code removing
> > this line just to master.  That correctly conflicted - and the person
> > doing the merge [me in this case - sorry for that] - picked the
> > version containing that line [either that I overlooked that, did not
> > investigate enough, or the tooling played tricks on me, and picked
> > that automatically - I don't remember].
> 
> I am not too concerned with a manual merge error. Such thing will
> happen. I would be concerned if this would fly by "under the radar" by
> tooling doing too much magic.

Unfortunately, I am really not sure what was this case :-(

> > [And before you think "this wouldn't have happened if we never merged
> > the release branch back into master, because we would be always
> > cherry-picking" - I just have a counter-example of a fix that was
> > committed to master quite some time ago, but after the libreoffice-3-4
> > branch-off, and fell though the cracks - nobody noticed that it hasn't
> > been cherry-picked to libreoffice-3-4.]
> 
> How does the merge from release to master help to get something on the
> release branch?

I am advocating the "do fixes in the release branch, and feature work in
master" approach - which would help here.

Regards,
Kendy