| 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: How to resolve git merge conflict in submodules? |
| From: | Michael Davidsaver via Core-talk <[email protected]> |
| To: | "Zimoch Dirk (PSI)" <[email protected]> |
| Cc: | "[email protected]" <[email protected]> |
| Date: | Fri, 20 Sep 2019 07:57:40 -0700 |
On 9/20/19 7:35 AM, Zimoch Dirk (PSI) via Core-talk wrote: > How to pick one submodule version? Switch to module/<blah> and 'git checkout <rev>'. The "cd ../.." back to the top and "git add module/<blah>".