Re: [Bug] git stash generates a different diff then other commands (diff, add, etc) resulting in merge conflicts!

2013-08-12 Thread Luke San Antonio
On 08/12/2013 12:05 PM, Phil Hord wrote: On Mon, Aug 12, 2013 at 1:29 AM, Luke San Antonio 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 you restore

Re: [Bug] git stash generates a different diff then other commands (diff, add, etc) resulting in merge conflicts!

2013-08-11 Thread Luke San Antonio
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 as

[Bug] git stash generates a different diff then other commands (diff, add, etc) resulting in merge conflicts!

2013-08-08 Thread Luke San Antonio
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 upstre