2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 <2018> 2019 2020 2021 2022 2023 2024 | Index | 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 <2018> 2019 2020 2021 2022 2023 2024 |
<== Date ==> | <== Thread ==> |
---|
Subject: | Re: A question for the git experts |
From: | Dirk Zimoch <[email protected]> |
To: | "Konrad, Martin" <[email protected]>, EPICS Core Talk <[email protected]> |
Date: | Mon, 1 Oct 2018 09:47:10 +0200 |
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?