Re: A question for the git experts

["Konrad, Martin" <konrad@frib.msu.edu>]

Hi Dirk,
> Is there a better way to do this?
Always merge from "upstream" to "PSI-7.0" 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