Experimental Physics and
Industrial Control System

Dirk Zimoch <[email protected]> · Wed, 29 Nov 2017 10:13:13 +0100

Ho can I keep in sync with core/master including all submodules?

$ git status
# On branch PSI
# 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)

#   (commit or discard the untracked or modified content in submodules)
#
#       modified:   modules/libcom (new commits)
#       modified:   modules/normativeTypes (new commits)
#       modified:   modules/pvAccess (new commits, modified content)
#       modified:   modules/pvData (modified content)
#       modified:   modules/pva2pva (new commits, modified content)
#       modified:   modules/pvaClient (new commits)
#
no changes added to commit (use "git add" and/or "git commit -a")

modules/libcom $ git status
# HEAD detached at fae4d58
nothing to commit, working directory clean

modules/normativeTypes $ git status
# HEAD detached at 91c5136
nothing to commit, working directory clean

modules/normativeTypes $ git status
# HEAD detached at 91c5136
nothing to commit, working directory clean

What's going on?

The problem is that base-7.0.1-pre1 now compiles for me but when I try

to get the changes into core/master, it does not compile.

I have never worked with submodules (And my general git knowledge is

somewhat limited to clone, add, commit, push).

So how to work with the EPICS 7 git repo?

Experimental Physics and Industrial Control System

Experimental Physics and
Industrial Control System