On 14.05.2015, at 20:46, Chris Cunningham <cunningham.cb at gmail.com> wrote:

> or "Apply Changes" and "Ignore Changes" (or skip).
> 
> And someday (probably not part of this release) add symbols somewhere like + and - to indicate what is being added, and what is being removed.  I cannot keep the colors straight to decipher what is happening - often requiring me to open up a current view of the method to decide what is being proposed.
> 

We had some Students working on the merging stuff in the last years.
We'll review the stuff and probably contribute it to trunk.
Stay tuned :)

Best regards
	-Tobias

> But maybe that's just me.
> -cbc
> 
> On Thu, May 14, 2015 at 8:53 AM, Chris Muller <asqueaker at gmail.com> wrote:
> I liked your "Skip" and "Load" even better, but I wasn't asking about
> the button labels, I'm trying to ask how to properly build a Spur
> image..
> 
> On Thu, May 14, 2015 at 6:24 AM, Bert Freudenberg <bert at freudenbergs.de> wrote:
> > On 13.05.2015, at 20:25, karl ramberg <karlramberg at gmail.com> wrote:
> >
> >
> > How about:
> >
> > Keep local
> > Install remote
> >
> >
> > Hmm I like that.
> >
> > - Bert -
> >
> >
> >
> >
> >
> >