Experimental Physics and
Industrial Control System

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>".

Replies:

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

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

Navigate by Date:

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

Next: Build failed: EPICS Base base-7.0-454 AppVeyor 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? Zimoch Dirk (PSI) 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