convore.json/groups/git/dropping-a-commit-from-a-branch-after-a-merge/messages.json

[{"user_id": 1822, "stars": [], "topic_id": 13813, "date_created": 1300468533.292403, "message": "hit a bit of a puzzle today - had a branch that had a merge from upstream", "group_id": 106, "id": 383845}, {"user_id": 1822, "stars": [], "topic_id": 13813, "date_created": 1300468546.545337, "message": "I wanted to use rebase -i to drop one of my commits from the history", "group_id": 106, "id": 383849}, {"user_id": 1822, "stars": [], "topic_id": 13813, "date_created": 1300468675.6222739, "message": "I aborted and worked around by checking out the file in question from master, then cherry-picking my earlier changes back on top, then doing a straight merge", "group_id": 106, "id": 383878}, {"user_id": 1822, "stars": [], "topic_id": 13813, "date_created": 1300468559.6413929, "message": "it failed saying that it couldn't apply one of the merged commits", "group_id": 106, "id": 383851}, {"user_id": 1822, "stars": [], "topic_id": 13813, "date_created": 1300468700.854557, "message": "are there known complications rebasing after a merge from upstream?", "group_id": 106, "id": 383882}, {"user_id": 927, "stars": [{"date_created": 1302487348.5070479, "user_id": 28560}], "topic_id": 13813, "date_created": 1300762460.284054, "message": "Devil's advocate: why not revert that commit? The history might not be pristine but it'd be cleaner once you have more than one repo", "group_id": 106, "id": 404631}]