Re: How to resolve git merge conflict in submodules?

[Jeong Han Lee via Core-talk <core-talk@aps.anl.gov>]

Hi Dirk,

  If you run the following command, you can access the diff info from 
main epics-base into submodules

  git config --global diff.submodule diff

  This is the corresponding option for ~/.gitconfig

  [diff]
	submodule=diff


  I don't know which version of git will support this feature.


  If you work into git submodules, go there, change it, and commit to 
git submodule repo individually. And move back to the main, and change 
"hash id" of this submodule, and commit to main repo.

  Sometime, if you don't care about, you can use ignore option, in your 
main repo also such as.


[submodule "epics-base"]
        path = epics-base
        url = https://github.com/epics-base/epics-base
        branch = 7.0
        ignore = all


  HTH,
  Han




On 9/20/19 2:40 PM, Marty Kraimer via Core-talk wrote:
> Have you tried git diff?
> For example:
>
> git diff  modules/pvData
>
> 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