{"thread":{"id":"652","subject":"'git resolve'","startedAt":"2005-05-18T18:50:18Z","lastAt":"2005-05-18T18:50:18Z","messageCount":1,"participants":["Thomas Glanzmann"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"3510","messageId":"20050518185018.GE4738@cip.informatik.uni-erlangen.de","threadId":"652","inReplyTo":null,"subject":"'git resolve'","fromName":"Thomas Glanzmann","fromEmail":"sithglan@stud.uni-erlangen.de","sentAt":"2005-05-18T18:50:18Z","receivedAt":"2005-05-18T18:50:18Z","isPatch":false,"sender":{"key":"sithglan@stud.uni-erlangen.de","avatar":null},"body":"Hello,\nhas someone out there an git-resolve script? Which guides the user tot\nhe process of stuff that is not handeled the autmatic merge or the\nthreeway merge?\n\n\tThomas\n"}]}