{"thread":{"id":"43718","subject":"Re: warning merge message","startedAt":"2006-12-20T21:34:44Z","lastAt":"2006-12-20T21:34:44Z","messageCount":1,"participants":["Luben Tuikov"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"297304","messageId":"100025.61738.qm@web31810.mail.mud.yahoo.com","threadId":"43718","inReplyTo":null,"subject":"Re: warning merge message","fromName":"Luben Tuikov","fromEmail":"ltuikov@yahoo.com","sentAt":"2006-12-20T21:34:44Z","receivedAt":"2006-12-20T21:34:44Z","isPatch":false,"sender":{"key":"ltuikov@yahoo.com","avatar":null},"body":"Furthermore, isn't the local origin fast forwarded to the\nremote master, and then the local origin merged into the\nlocal master and then the master checked out (presumably\nthe user hasn't edited contents of their master branch).\n\nThis \"warning\" message is confusing and the branch.<branch>.merge\nconfig option poorly documented.\n\nCan someone clarify these things to me please?\n\nThanks,\n    Luben\n"}]}