Re: [Subclipse-users] how to merge binaries? (and when to get a synchronized view merge?)

On Dec 11, 2007 12:36 PM, Johan Compagner <jcompagner@gmail.com> wrote:
> I dont want to merge binaries (at least not parts or something like that)
>
> No i do now merge from that branch to my local workspace revision X to X+1
>
> in that merge i have updated jars. Those jars are reported as conflicts
> and what i want is say yes i want the jars from remote, i want to overwrite
> the jars i have locally
> I dont seem to be able to do that.

In 1.2.x, you have to copy the appropriate JAR into place and then
mark it resolved. In 1.4.x the Quick Fix will work properly. In the
merge client I pointed you to there is an option to just say you want
to resolve any conflicts in binary files using the incoming file.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org