Experimental Physics and
Industrial Control System

On Fri, 2019-09-20 at 07:57 -0700, Michael Davidsaver wrote:
> 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>".

Ok, that worked. Thanks.
Dirk

References:

How to resolve git merge conflict in submodules? Zimoch Dirk (PSI) via Core-talk

Re: How to resolve git merge conflict in submodules? Zimoch Dirk (PSI) via Core-talk

Re: How to resolve git merge conflict in submodules? Marty Kraimer via Core-talk

Re: How to resolve git merge conflict in submodules? Jeong Han Lee via Core-talk

Re: How to resolve git merge conflict in submodules? Zimoch Dirk (PSI) via Core-talk

Re: How to resolve git merge conflict in submodules? Michael Davidsaver via Core-talk

Re: How to resolve git merge conflict in submodules? Zimoch Dirk (PSI) via Core-talk

Re: How to resolve git merge conflict in submodules? Michael Davidsaver via Core-talk

Navigate by Date:

Prev: [Bug 1844537] Re: OMSL doesn't work with constant DOL Ralph Lange via Core-talk

Next: RE: EPICS 7 build failures on Appveyor/Windows Freddie Akeroyd - UKRI STFC via Core-talk

Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  2017  2018  <2019>  2020  2021  2022  2023  2024 

Navigate by Thread:

Prev: Re: How to resolve git merge conflict in submodules? Michael Davidsaver via Core-talk

Next: Re: How to resolve git merge conflict in submodules? Zimoch Dirk (PSI) via Core-talk

Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  2017  2018  <2019>  2020  2021  2022  2023  2024