[news.eclipse.technology.subversive] Re: Why "Are you sure you want to m

["Igor Burilo" <igor.burilo@xxxxxxxxxxxx>]

Hello Jörg,

As we added support for logical models, synchronize view was also changed. 
When you call "Update all incoming changes" action, at first it's handled by 
Team infrastrucuture and then processing is passed to Subversive. "Confirm 
Merge" dailog which asks you "Are you sure you want to merge ..." is not 
Subversive dialog, it's called by Team infrastructure.
Also 'merge' doesn't mean that you have conflicts, it means that there's 
something that is need to union, e.g. if you have incoming changes to file 
then 'merge' means that you need to union incoming changes with current file 
content; conflicts happen only if auto merge can't be done.

> Hi,
>
> for quite some time now, subversive will ask "Are you sure you want to
> merge XXX resources" upon hitting the "Update all incoming changes"
> button, even though there are no conflicts.
>
> This message is always alarming me since it makes me wonder what files
> will be merged even though I didn't see any conflicts.
>
> Is this a bug? This message had been correct in some earlier versions of
> subversive.
>
> Regards,
> Jörg