Experimental Physics and
Industrial Control System

On 28.09.2018 16:31, Konrad, Martin wrote:
> Hi Dirk,
>> Is there a better way to do this?
> Always merge from "upstream" to "PSI-7.0"

Yes, that part works.

> never the other way around.
> Develop on your "PSI-7.0" branch and then "git cherry-pick" the commits
> you consider generic enough to "upstream". This shouldn't result in
> merge conflicts when you merge from "upstream" to "PSI-7.0" in the future.
>
> -Martin

There is no way to automatically cherry-pick all the changes after a
given commit, is there?