arian | 11 Jun 14:40 2012
Picon

resolving conflicts

Hi there

is there an easy why of resolving conflict using eclipse where ones
own changes are whats important and one would like to commit the
changes without worrying about changes made to the same file from the
other side?

(sorry, hope this doesn't sound too vague)

--

-- 
You received this message because you are subscribed to the Google Groups "Google Web Toolkit" group.
To post to this group, send email to google-web-toolkit@...
To unsubscribe from this group, send email to google-web-toolkit+unsubscribe@...
For more options, visit this group at http://groups.google.com/group/google-web-toolkit?hl=en.

Joseph Lust | 11 Jun 16:38 2012
Picon

Re: resolving conflicts

Do you mean an SCM conflict?


Joe

--
You received this message because you are subscribed to the Google Groups "Google Web Toolkit" group.
To view this discussion on the web visit https://groups.google.com/d/msg/google-web-toolkit/-/o_8Mkilhgd0J.
To post to this group, send email to google-web-toolkit-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
To unsubscribe from this group, send email to google-web-toolkit+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
For more options, visit this group at http://groups.google.com/group/google-web-toolkit?hl=en.

Gmane