[git-users] Advice on how to structure branches

2014-09-17 Thread Tom Green
I'm sure this is a dumb question from a beginner One product, one master (I guess). How is the best way to set up branches I want to basically have 3 versions going concurrently: 1. STABLE version which our implementation team can safely install on client machines 2. QA version

[git-users] File dates after CHECKOUT

2014-09-30 Thread Tom Green
I am working in Windows with GIT. When I need to fix an older released version of our system I CHECKOUT that version. GIT restores the files in my working directory to the *contents* they had on that time. But it does not restore the *file dates*. This causes me problems because many of the to

[git-users] Re: File dates after CHECKOUT

2014-09-30 Thread Tom Green
Thanks, Konstantin. That's what I was afraid of. -- Tom On Tuesday, September 30, 2014 11:17:11 AM UTC-4, Tom Green wrote: > I am working in Windows with GIT. > > When I need to fix an older released version of our system I CHECKOUT that > version. GIT restores the fi

[git-users] Can't restore from stash

2013-03-03 Thread Tom Green
I did a GIT STASH (working in Windows command line). Now I can't restore from it I get the message: TECHNOTE/git.TXT: needs merge unable to refresh index I tried commiting that file and I tried deleting it, but I still get the same problem. I really don't care about that particular f

[git-users] Re: Can't restore from stash

2013-03-03 Thread Tom Green
Thanks, Konstantin. How do I go about merging that one file in my stash into my working directory so I can proceed? On Sunday, March 3, 2013 12:27:03 PM UTC-5, Tom Green wrote: > I did a GIT STASH (working in Windows command line). Now I can't restore > from it > I g

Re: [git-users] Re: Can't restore from stash

2013-03-03 Thread Tom Green
On Sunday, March 3, 2013 5:25:30 PM UTC-5, Konstantin Khomoutov wrote: > > On Sun, Mar 03, 2013 at 11:56:10AM -0800, Tom Green wrote: > > > > I did a GIT STASH (working in Windows command line). Now I can't > restore > > > from it > > > I get the