Experimental Physics and Industrial Control System
|
Hi Michael,
I will try that tomorrow when I‘m back at work.
Git drives me crazy.
Dirk,
Calm down and don't delete anything.
Lets first focus on recovery to where you were previously.
When you run:
gitk stash@{0}
You should see the revision which was checked out when you saved this stash.
Run
git checkout -b <tempbranchname> <revision>
This will create a new/temporary branch at the base revision.
Now
git submodule update
Which updates the sub-modules to be at the revision(s) when the super-module
commit was made.
Finally
git stash apply
Which should succeed if everything is really back as it was (wrt. untracked files).
Michael
On 12/07/2017 11:51 AM, Dirk Zimoch wrote:
So how can I check out the latest version from the server to apply my stash on?
On 07.12.2017 17:49, Dirk Zimoch wrote:
On 07.12.2017 17:46, Michael Davidsaver wrote:
On 12/07/2017 11:42 AM, Dirk Zimoch wrote:
My changes are seemingly gone (?) and the module is distressingly empty.
Wrong branch? Maybe.
Your changes are not gone:
Run
git stash list
Your most recent stash is stash@{0}
You can use
gitk stash@{0}
which should show your changes, and which revision they were made
against.
$ git stash list
stash@{0}: WIP on (no branch): f44bfd8 Install databaseModuleDirs.pm
into bin/<host>
|
- References:
- more git problems Dirk Zimoch
- Re: more git problems Michael Davidsaver
- Re: more git problems Dirk Zimoch
- Re: more git problems Dirk Zimoch
- Re: more git problems Michael Davidsaver
- Navigate by Date:
- Prev:
Jenkins build is back to normal : epics-master » linux32 #31 APS Jenkins
- Next:
Re: base-7.0, can't make on linux Andrew Johnson
- 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: more git problems Michael Davidsaver
- Next:
Build failed in Jenkins: epics-master » mac #30 APS Jenkins
- Index:
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
<2017>
2018
2019
2020
2021
2022
2023
2024
|
ANJ, 21 Dec 2017 |
·
Home
·
News
·
About
·
Base
·
Modules
·
Extensions
·
Distributions
·
Download
·
·
Search
·
EPICS V4
·
IRMIS
·
Talk
·
Bugs
·
Documents
·
Links
·
Licensing
·
|