On Sat, 9 Mar 2013 09:44:34 -0800
Piers Haken wrote:
> >> i must be missing something, but i just don't see it. what is that
> >> SVN is doing wrong by making this so simple?
> >
> > Let's cite the `git merge` manual:
> >
> > Warning: Running git merge with uncommitted changes is discouraged:
On Mar 9, 2013, at 3:02 AM, Konstantin Khomoutov
wrote:
> On Fri, Mar 08, 2013 at 06:03:34PM -0800, Piers H wrote:
>> i must be missing something, but i just don't see it. what is that SVN is
>> doing wrong by making this so simple?
>
> Let's cite the `git merge` manual:
>
> Warning: Runnin
From: "Konstantin Khomoutov"
To:
Sent: Saturday, March 09, 2013 11:02 AM
Subject: Re: [git-users] HELP! "stash pop" is failing and I can't get my
work out
On Fri, Mar 08, 2013 at 06:03:34PM -0800, Piers H wrote:
[...]
i seriously don't understand why it&
On Fri, Mar 08, 2013 at 06:03:34PM -0800, Piers H wrote:
[...]
> i seriously don't understand why it's so hard to do this seemingly simple
> thing - bring me up-to-date. i just want it to get the changes, merge them
> in and show me the conflicts. i don't know why i have to push my local
> chan
well, thanks for your help. but, in the end i just blew away all my work
and started again from scratch.
not happy.
i seriously don't understand why it's so hard to do this seemingly simple
thing - bring me up-to-date. i just want it to get the changes, merge them
in and show me the conflicts.
On Sat, Mar 09, 2013 at 02:51:16AM +0400, Konstantin Khomoutov wrote:
[...]
> I recall someone appearing here sharing their similar frustration with
> Git not doing file-level merging when bringing in "upstream" changes,
> with automatically making untracked files tracked, if the same-named
> file
On Fri, Mar 08, 2013 at 01:06:04PM -0800, Piers H wrote:
> So, i'm doing the 'stash/pull/pop' dance that git forces me to go through
> when pulling changes into a modified working tree, and it has come back
> with a whole bunch of ' already exists, no checkout', 'could not
> restore untracked f
So, i'm doing the 'stash/pull/pop' dance that git forces me to go through
when pulling changes into a modified working tree, and it has come back
with a whole bunch of ' already exists, no checkout', 'could not
restore untracked files from stash'.
so now i'm screwed and extremely frustrated.
w
