| 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 <2018> 2019 2020 2021 2022 2023 2024 2025 | Index | 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 <2018> 2019 2020 2021 2022 2023 2024 2025 |
| <== Date ==> | <== Thread ==> |
|---|
| Subject: | Re: A question for the git experts |
| From: | "Konrad, Martin" <[email protected]> |
| To: | Dirk Zimoch <[email protected]>, EPICS Core Talk <[email protected]> |
| Date: | Fri, 28 Sep 2018 14:31:30 +0000 |
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