| 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 <2017> 2018 2019 2020 2021 2022 2023 2024 | Index | 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 <2017> 2018 2019 2020 2021 2022 2023 2024 |
| <== Date ==> | <== Thread ==> |
|---|
| Subject: | Re: more git problems |
| From: | Dirk Zimoch <[email protected]> |
| To: | Michael Davidsaver <[email protected]>, "[email protected]" <[email protected]> |
| Date: | Thu, 7 Dec 2017 18:00:45 +0100 |
git status suggests to 'use "git reset HEAD <file>..." to unstage' So I did git reset HEAD now: git co database/mastererror: Untracked working tree file 'src/std/dev/devMbbiDirectSoft.c' would be overwritten by merge.
git status src/std/dev/devMbbiDirectSoft.c # On branch core/master # Untracked files: # (use "git add <file>..." to include in what will be committed) # # src/std/dev/devMbbiDirectSoft.c nothing added to commit but untracked files present (use "git add" to track) git stash No local changes to save What the hell is going on? On 07.12.2017 17:51, 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: Rungit stash listYour most recent stash is stash@{0} You can usegitk 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>