On 08/21/14 15:21, Thomas Wiens wrote:
On 21 August 2014 21:10, Jeff Morriss wrote:
What does "git status" say at this point?
Thomas@VORTEX /c/Development/wireshark (s7comm)
$ git status
On branch s7comm
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: config.nmake
no changes added to commit (use "git add" and/or "git commit -a")
should I do
git checkout -- config.nmake
?
But then I'll always have to change it when I want to build wireshark on
my own.
Oh, yeah, I forgot about that file always being modified on Windows
(it's been years since I tried to build on Windows).
For the short term, I'd suggest doing:
git stash
git review [-f]
git stash pop
There might be a better answer longer term--maybe one of the guys who
actually uses Windows has practical suggestion.
Sorry for my 'dumb' questions, I've no experience with git and only
single-user experience with svn. Building a wireshark dissector is
easier than getting through git...
It gets easier with time. :-)
