{"thread":{"id":"13736","subject":"changing history once public","startedAt":"2008-05-30T21:24:50Z","lastAt":"2008-05-30T21:37:19Z","messageCount":2,"participants":["John J. Franey","Jon Loeliger"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"78178","messageId":"1212182690.8311.30.camel@isidore.myhome.westell.com","threadId":"13736","inReplyTo":null,"subject":"changing history once public","fromName":"John J. Franey","fromEmail":"jjfraney@gmail.com","sentAt":"2008-05-30T21:24:50Z","receivedAt":"2008-05-30T21:24:50Z","isPatch":false,"sender":{"key":"jjfraney@gmail.com","avatar":null},"body":"I think I understand the issue with changing history on branches that\nhave been made public.\n\nWhat is the negative of publishing a branch and not being able to apply\nhistory changing commands?\n\nIf I want to keep this branch current (in public), I would pull from the\ntracking branch resolve conflicts and push to my public repo.  This\naction leaves my commit as the parent of another commit; it is not\nlonger at HEAD.  Does it matter if my commit is no longer HEAD of my\nbranch?\n\nI think the downside of not keeping my branch current is that I'd be\nhanding off to my colleagues the task of resolving merge conflicts.  Is\nthat right?\n\nThanks,\nJohn\n"},{"id":"78183","messageId":"4840738F.2070909@freescale.com","threadId":"13736","inReplyTo":"1212182690.8311.30.camel@isidore.myhome.westell.com","subject":"Re: changing history once public","fromName":"Jon Loeliger","fromEmail":"jdl@freescale.com","sentAt":"2008-05-30T21:37:19Z","receivedAt":"2008-05-30T21:37:19Z","isPatch":false,"sender":{"key":"jdl@jdl.com","avatar":"https://gravatar.com/avatar/75ce9a10b151acd2c28ec4ab2136dba7b2ff1634530bd04b155981a749d08a64?d=mp&s=160"},"body":"John J. Franey wrote:\n> I think I understand the issue with changing history on branches that\n> have been made public.\n> \n> What is the negative of publishing a branch and not being able to apply\n> history changing commands?\n\nIf there is something in that history you want to \"remove\",\nit must be done as an inverse patch, or an additional \"removal\"\npatch.  You can't just change the history by backing it up and\nwriting it differently.\n\n> If I want to keep this branch current (in public), I would pull from the\n> tracking branch resolve conflicts and push to my public repo. \n\nRight.\n\n> This\n> action leaves my commit as the parent of another commit; it is not\n> longer at HEAD.  Does it matter if my commit is no longer HEAD of my\n> branch?\n\nUh, by definition HEAD is the current-most commit on your\nactive branch, right?\n\nHTH,\njdl\n"}]}