Experimental Physics and
Industrial Control System

On Fri, 2019-09-20 at 08:40 -0400, Marty Kraimer via Core-talk wrote:
> Have you tried git diff?
> For example:
> 
> git diff  modules/pvData

diff --cc modules/pvData
index cdd6980,b903df5..0000000
--- a/modules/pvData
+++ b/modules/pvData

That is not a very helpful output and part of my problems with submodules.
Dirk

> 
> Marty
> 
> On 9/20/19 4:10 AM, Zimoch Dirk (PSI) via Core-talk wrote:
> > On Fri, 2019-09-20 at 08:07 +0000, Zimoch Dirk (PSI) via Core-talk wrote:
> > > Hi all,
> > > 
> > > I have a git problem (again) and google and stackoverflow did not really help.
> > > 
> > > A merge failed with this status:
> > > 
> > 
> > I wasn't in the top directory but in modules/. Here is the git status from top.
> > 
> > # Changes to be committed:
> > #
> > #	modified:   configure/CONFIG_BASE_VERSION
> > #	modified:   documentation/RELEASE_NOTES.html
> > #	modified:   documentation/ReleaseChecklist.html
> > #	modified:   modules/ca/configure/CONFIG_CA_VERSION
> > #	modified:   modules/database/configure/CONFIG_DATABASE_VERSION
> > #	modified:   modules/database/src/ioc/misc/dbCore.dbd
> > #	modified:   modules/libcom/configure/CONFIG_LIBCOM_VERSION
> > #	modified:   modules/libcom/src/log/iocLog.c
> > #	modified:   modules/libcom/src/log/iocLogServer.c
> > #	modified:   modules/libcom/src/log/logClient.c
> > #	modified:   modules/libcom/src/log/logClient.h
> > #	modified:   modules/libcom/src/osi/os/RTEMS/devLibVMEOSD.c
> > #	modified:   modules/normativeTypes
> > #	modified:   modules/pva2pva
> > #	modified:   modules/pvaClient
> > #
> > # Unmerged paths:
> > #   (use "git add <file>..." to mark resolution)
> > #
> > #	both modified:      modules/pvAccess
> > #	both modified:      modules/pvData
> > #	both modified:      modules/pvDatabase
> > #
> > # Changes not staged for commit:
> > #   (use "git add <file>..." to update what will be committed)
> > #   (use "git checkout -- <file>..." to discard changes in working directory)
> > #
> > #	modified:   modules/normativeTypes (new commits)
> > #	modified:   modules/pva2pva (new commits)
> > #	modified:   modules/pvaClient (new commits)
> > 
> > > What can I do about pvAccess, pvData, and pvDatabase? I cannot even find out what the conflict is.
> > > 
> > > 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

Navigate by Date:

Prev: Re: EPICS 7 build failures on Appveyor/Windows Ralph Lange 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 

Navigate by Thread:

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

Next: EPICS 7 build failures on Appveyor/Windows Ralph Lange 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