On Tue, Aug 13, 2013 at 1:31 AM, Luke San Antonio
lukesananto...@gmail.com wrote:
So I found an isolated case, it's very strange...
Here's a script!
deleted
Thanks for that. It was hard to read, but it demonstrates the problem well.
... Copy and paste that into a terminal and you should
On 08/12/2013 12:05 PM, Phil Hord wrote:
On Mon, Aug 12, 2013 at 1:29 AM, Luke San Antonio
lukesananto...@gmail.com wrote:
On 08/08/20130 04:54 PM, Phil Hord wrote:
Luke,
I think the issue is that your working directory receives your cached
file when you say 'git stash --keep-index'. When
On 08/08/20130 04:54 PM, Phil Hord wrote:
Luke,
I think the issue is that your working directory receives your cached
file when you say 'git stash --keep-index'. When you restore the
stash, your previous working directory now conflicts with your new
working directory, but neither is the same
Hi, my name's Luke!
Today, I had a problem merging a stash after immediately creating it.
This is exactly what I did!
git stash save --keep-index
git stash pop
And BAM! Merge conflict! This was especially weird because my file had
this in it (taken directly from my code!)
Updated upstream
On Thu, Aug 8, 2013 at 3:07 AM, Luke San Antonio
lukesananto...@gmail.com wrote:
Hi, my name's Luke!
Today, I had a problem merging a stash after immediately creating it.
This is exactly what I did!
git stash save --keep-index
git stash pop
And BAM! Merge conflict! This was especially
5 matches
Mail list logo
