{"issue":{"title":"A single commit modifying acceptor.lisp","user":{"login":"sebyte","id":126911,"url":"https://api.github.com/users/sebyte","gravatar_id":"a14868733f3c4580424e8775f10adddd","avatar_url":"https://secure.gravatar.com/avatar/a14868733f3c4580424e8775f10adddd?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-140.png"},"created_at":"2011-12-14T10:57:58Z","milestone":null,"state":"closed","updated_at":"2011-12-25T08:30:48Z","labels":[],"id":2550024,"closed_at":"2011-12-23T07:36:18Z","html_url":"https://github.com/edicl/hunchentoot/issues/17","pull_request":{"patch_url":"https://github.com/edicl/hunchentoot/pull/17.patch","html_url":"https://github.com/edicl/hunchentoot/pull/17","diff_url":"https://github.com/edicl/hunchentoot/pull/17.diff"},"body":"Hi Hans,\r\n\r\nThis is the first time I've issued a github pull request - all very exciting.\r\n\r\nThe commit in question fixes a small typo in the docstring belonging to the first (lexically speaking)\r\n```\r\n(defmethod acceptor-dispatch-request ...)\r\n```\r\nform, and wraps the docstring in 70 columns.\r\n\r\nHope this helps,\r\n\r\nSebastian","number":17,"url":"https://api.github.com/repos/edicl/hunchentoot/issues/17","comments":3,"assignee":null},"comment":{"user":{"login":"hanshuebner","id":108751,"url":"https://api.github.com/users/hanshuebner","gravatar_id":"280d76aa82179ae04550534649de1e6e","avatar_url":"https://secure.gravatar.com/avatar/280d76aa82179ae04550534649de1e6e?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-140.png"},"created_at":"2011-12-25T08:30:48Z","updated_at":"2011-12-25T08:30:48Z","id":3270220,"body":"Hi Sebastian,\r\n\r\nyou can revert to your previous state at any time, so whenever you\r\nmerge from master and git can't merge automatically, it will interrupt\r\nthe merge process and leave resolving the conflicts to you.  You can\r\nthen abort the merge if you desire so, or resolve the conflicts and\r\ncontinue.\r\n\r\nIt does not matter to me from which branch you push your changes or to\r\nwhich you pull them.\r\n\r\nHappy christmas,\r\nHans\r\n\r\nOn Sat, Dec 24, 2011 at 7:25 PM, Sebastian Tennant\r\n<reply@reply.github.com>\r\nwrote:\r\n> I think I'm comfortable with the git/github collaboration workflow now.  There's\r\n> one thing I'm not 100% sure about though...\r\n>\r\n> I was able to update my local copy of <tt>sebyte/hunchentoot master</tt> by\r\n> pulling from <tt>edicl/hunchentoot master</tt> without any merge conflicts\r\n> *because you accepted my modifications in their entirety*.  But what would have\r\n> happened if you had only accepted some of my modifications, or accepted them in\r\n> an altered form?  This would have resulted in a merge confilict when I pulled\r\n> from <tt>edicl/hunchentoot master</tt>, no?\r\n>\r\n> I'm wondering if I shouldn't make my modifications in a separate\r\n> <tt>sebyte/hunchentoot contrib</tt> branch in the future.  That way\r\n> <tt>sebyte/hunchentoot master</tt> can always track <tt>edicl/hunchentoot\r\n> master</tt> without fail.  I'll test this out next time, i.e., when I issue my\r\n> next pull request, if that's OK with you?\r\n>\r\n> Seb\r\n>\r\n> ---\r\n> Reply to this email directly or view it on GitHub:\r\n> https://github.com/edicl/hunchentoot/pull/17#issuecomment-3268587","url":"https://api.github.com/repos/edicl/hunchentoot/issues/comments/3270220"},"action":"created"}