resolving conflicts
17 views
Skip to first unread message
arian
Jun 11, 2012, 8:40:07 AM6/11/12
to Google Web Toolkit
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)
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)
Joseph Lust
Jun 11, 2012, 10:38:02 AM6/11/12
to google-we...@googlegroups.com
Do you mean an SCM conflict?
Joe
Reply all
Reply to author
Forward
0 new messages