Merge 5.0.1 into 5.1

Created by: perj

Currently 5-0-stable and 5-1-stable have diverged, which means you can't move from 5.0.1 to 5.1 with a git merge, which we need due to local changes.

Steps to reproduce:

git checkout 5-0-stable
git merge origin/5-1-stable

Created by: senny

I don't think this is necessary...

@randx thoughts?

By Administrator on 2013-05-15T17:22:14 (imported from GitLab project)

By Administrator on 2013-05-15T17:22:14 (imported from GitLab)

Created by: dzaporozhets

@senny I also think so

By Administrator on 2013-05-16T07:10:46 (imported from GitLab project)

By Administrator on 2013-05-16T07:10:46 (imported from GitLab)

Created by: senny

@morth git should be flexibel enough that you can resolve your local situation without affecting the graph of the project.

By Administrator on 2013-05-16T07:16:01 (imported from GitLab project)

By Administrator on 2013-05-16T07:16:01 (imported from GitLab)

Created by: perj

Well, it was difficult to sort out conflicts between 5-0-stable and 5-1-stable vs. conflicts against my own code... but frankly I assumed this wouldn't be merged, just wanted to inform you that it's a potential problem. :)

By Administrator on 2013-05-16T07:45:51 (imported from GitLab project)

By Administrator on 2013-05-16T07:45:51 (imported from GitLab)

Created by: senny

@morth sadly this issue arises when multiple longer-running branches are in play. To mitigate some of the pain, I suggest you only apply your changes on-top of 5-1-stable instead of merging the whole branch. This way you only get the conflicts directly related to your code.

By Administrator on 2013-05-16T07:51:27 (imported from GitLab project)

By Administrator on 2013-05-16T07:51:27 (imported from GitLab)