OSDN Git Service

Handle "conflicted" transactions properly