Experimental Physics and
Industrial Control System

Hi all,

I have a git problem (again) and google and stackoverflow did not really help.

A merge failed with this status:
# Changes to be committed:
#
#	modified:   ../configure/CONFIG_BASE_VERSION
#	modified:   ../documentation/RELEASE_NOTES.html
#	modified:   ../documentation/ReleaseChecklist.html
#	modified:   ca/configure/CONFIG_CA_VERSION
#	modified:   database/configure/CONFIG_DATABASE_VERSION
#	modified:   database/src/ioc/misc/dbCore.dbd
#	modified:   libcom/configure/CONFIG_LIBCOM_VERSION
#	modified:   libcom/src/log/iocLog.c
#	modified:   libcom/src/log/iocLogServer.c
#	modified:   libcom/src/log/logClient.c
#	modified:   libcom/src/log/logClient.h
#	modified:   libcom/src/osi/os/RTEMS/devLibVMEOSD.c
#	modified:   normativeTypes
#	modified:   pva2pva
#	modified:   pvaClient
#
# Unmerged paths:
#   (use "git add <file>..." to mark resolution)
#
#	both modified:      pvAccess
#	both modified:      pvData
#	both modified:      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:   normativeTypes (new commits)
#	modified:   pva2pva (new commits)
#	modified:   pvaClient (new commits)
#

What can I do about pvAccess, pvData, and pvDatabase? I cannot even find out what the conflict is.

Dirk

Replies:

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

Navigate by Date:

Prev: Re: [Merge] ~dirk.zimoch/epics-base:iocLogClientFixesTry2 into epics-base:7.0 Dirk Zimoch 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: Build failed: epics-base base-7.0-301 AppVeyor 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