Argonne National Laboratory

Experimental Physics and
Industrial Control System

2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  <2017 Index 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  <2017
<== Date ==> <== Thread ==>

Subject: more git problems
From: Dirk Zimoch <dirk.zimoch@psi.ch>
To: "core-talk@aps.anl.gov" <core-talk@aps.anl.gov>
Date: Thu, 7 Dec 2017 17:42:20 +0100
I tried to do changes on modules/database

When I wanted to commit, I get the error that I am not on any branch.
Then I did
* git stash
* in the top level: git submodule update --remote
* back in modules/database: git co core/master
* git stash apply
Here I get the errors:
CONFLICT (delete/modify): src/std/dev/devMbbiDirectSoft.c deleted in Updated upstream and modified in Stashed changes. Version Stashed changes of src/std/dev/devMbbiDirectSoft.c left in tree.
... [for all my changes]

git status tells me:
# On branch core/master
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#       deleted by us:      ../../../src/std/dev/devMbbiDirectSoft.c
#       deleted by us:      ../../../src/std/dev/devMbbiDirectSoftCallback.c
#       deleted by us:      ../../../src/std/dev/devMbbiDirectSoftRaw.c
#       deleted by us:      ../../../src/std/dev/devMbboDirectSoft.c
#       deleted by us:      ../../../src/std/dev/devMbboDirectSoftCallback.c
#       deleted by us:      ../../../src/std/rec/mbbiDirectRecord.c
#       deleted by us:      ../../../src/std/rec/mbbiDirectRecord.dbd
#       deleted by us:      ../../../src/std/rec/mbboDirectRecord.c
#       deleted by us:      ../../../src/std/rec/mbboDirectRecord.dbd
#       deleted by us:      Makefile

My changes are seemingly gone (?) and the module is distressingly empty.
Wrong branch? Maybe.

git co database/master
error: Your local changes to the following files would be overwritten by checkout:
        configure/os/CONFIG_SITE.Common.vxWorksCommon
        configure/os/CONFIG_SITE.linux-x86.Common
        configure/os/CONFIG_SITE.linux-x86_64.Common
Please, commit your changes or stash them before you can switch branches.
Aborting

HELP!



Replies:
Re: more git problems Dirk Zimoch
Re: more git problems Michael Davidsaver

Navigate by Date:
Prev: Re: base-7.0, can't make on linux Andrew Johnson
Next: Re: more git problems Dirk Zimoch
Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  <2017
Navigate by Thread:
Prev: RE: base-7.0, can't make on linux Mark Rivers
Next: Re: more git problems Dirk Zimoch
Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  <2017
ANJ, 07 Dec 2017 Valid HTML 4.01! · Home · News · About · Base · Modules · Extensions · Distributions · Download ·
· EPICS V4 · IRMIS · Talk · Bugs · Documents · Links · Licensing ·