RE: [RFC] Shelving and Checkpointing

> -----Original Message-----
> From: Julian Foad [mailto:julianfoad_at_apache.org]
> Sent: woensdag 12 juli 2017 16:38
> To: Mark Phippard <markphip_at_gmail.com>
> Cc: Subversion Developers <dev_at_subversion.apache.org>
> Subject: Re: [RFC] Shelving and Checkpointing
>
> Mark Phippard wrote:
> > Nice to see you have gotten this far.
> >
> > I am not even sure how this behaves with git stash but what happens if
> > the patch cannot be applied cleanly? Is the path to "fixing things"
> > relatively clear? Like does patch just create conflicts that you
> > resolve like anything else?
>
> It is 'svn patch' -- so it raises conflicts.

Svn patch creates reject files. It doesn't create conflicts (yet).

        Bert
Received on 2017-07-12 17:08:42 CEST