Dave Borowitz c0083226ab Retry MergeOp after LOCK_FAILURE when updating branch ...

If the project requires fast-forwards, the MergeOp cannot succeed once
a lock failure occurs, but other cases, it should be safe to retry the
merge immediately. So, just put it back in the queue.

Change-Id: I9a16e969a9d9c724e4ed20bff030d70eb7bb91d6

2012-10-11 11:11:45 -07:00

..

.settings

Remove timestamp from all org.eclipse.core.resources.prefs files.

2012-07-04 14:06:09 +02:00

src

Retry MergeOp after LOCK_FAILURE when updating branch

2012-10-11 11:11:45 -07:00

.gitignore

Add Intellij IDEA files to ignore list

2012-05-03 13:17:43 -07:00

pom.xml

Use juniversalchardet from Maven central

2012-08-29 12:32:43 +02:00