convore.json/groups/git/merging-into-branch-that-is-not-checked-out/messages.json

[{"user_id": 5778, "stars": [], "topic_id": 9140, "date_created": 1298667998.0790861, "message": "Normally I simply do something like this", "group_id": 106, "id": 211300}, {"user_id": 5778, "stars": [], "topic_id": 9140, "date_created": 1298668004.0975671, "message": "git checkout master", "group_id": 106, "id": 211301}, {"user_id": 5778, "stars": [], "topic_id": 9140, "date_created": 1298668014.1806459, "message": "git merge remote_branch", "group_id": 106, "id": 211304}, {"user_id": 5778, "stars": [], "topic_id": 9140, "date_created": 1298668054.452352, "message": "is it possible to merge changes from remote_branch onto master without having to leave branch_im_working_on?", "group_id": 106, "id": 211309}, {"user_id": 10831, "stars": [], "topic_id": 9140, "date_created": 1298668680.574024, "message": "with update-ref", "group_id": 106, "id": 211366}, {"user_id": 10831, "stars": [{"date_created": 1298668878.8783369, "user_id": 5778}, {"date_created": 1298669791.2108631, "user_id": 8391}, {"date_created": 1298670542.1228061, "user_id": 1736}, {"date_created": 1298694432.967747, "user_id": 4156}], "topic_id": 9140, "date_created": 1298668690.9705241, "message": "so now that i've said it, don't do it", "group_id": 106, "id": 211369}, {"user_id": 5778, "stars": [], "topic_id": 9140, "date_created": 1298668899.130805, "message": "interesting", "group_id": 106, "id": 211393}, {"user_id": 5778, "stars": [], "topic_id": 9140, "date_created": 1298667987.7378349, "message": "So I've been wondering about the best way to basically fast-forward my local master branch when I pull in changes from a remote repo without having to check out my local master branch.", "group_id": 106, "id": 211298}, {"user_id": 5778, "stars": [], "topic_id": 9140, "date_created": 1298668027.4600871, "message": "git checkout branch_im_working_on", "group_id": 106, "id": 211305}, {"user_id": 10831, "stars": [], "topic_id": 9140, "date_created": 1298668671.9289501, "message": "no, but you can move the master branch without being on it to point to remote_branch instead", "group_id": 106, "id": 211365}, {"user_id": 5778, "stars": [], "topic_id": 9140, "date_created": 1298668903.9409871, "message": "thanks @chacon!", "group_id": 106, "id": 211395}, {"user_id": 10831, "stars": [], "topic_id": 9140, "date_created": 1298668684.259063, "message": "but that's dangerous", "group_id": 106, "id": 211368}, {"user_id": 10831, "stars": [], "topic_id": 9140, "date_created": 1298668913.4872739, "message": "np", "group_id": 106, "id": 211396}, {"user_id": 5778, "stars": [], "topic_id": 9140, "date_created": 1298668926.097831, "message": "yeah, I've always felt dirty any time I have a branch point directly at a remote branch", "group_id": 106, "id": 211397}, {"user_id": 10831, "stars": [], "topic_id": 9140, "date_created": 1298668765.9594779, "message": "otherwise you need the working directory for the merge in case there are any issues with the merge", "group_id": 106, "id": 211378}, {"user_id": 10831, "stars": [], "topic_id": 9140, "date_created": 1298668798.5386641, "message": "it needs to use your index and working directory to do basically any actual merge", "group_id": 106, "id": 211380}, {"user_id": 10831, "stars": [], "topic_id": 9140, "date_created": 1298668843.753433, "message": "if you wanted to be clever and you do it a lot, you could use the git-new-workdir script to always have a workdir just for master elsewhere and use that for doing the upstream merges", "group_id": 106, "id": 211386}, {"user_id": 6004, "stars": [], "topic_id": 9140, "date_created": 1298999759.879823, "message": "whats your reason for not wanting to leave your current branch?  uncommited changes? Do a stash, switch to master, pull/merge/etc, switch to prev working branch, do a stash pop - back to the spot you were 2 minutes ago.", "group_id": 106, "id": 236308}, {"user_id": 5778, "stars": [], "topic_id": 9140, "date_created": 1299006334.370708, "message": "it would be nice to type one command instead of 4 or 5 commands, but I understand why it's not really possible (or reasonable)", "group_id": 106, "id": 237060}, {"user_id": 5778, "stars": [], "topic_id": 9140, "date_created": 1299006292.8100441, "message": "@ObsidionStorm yes, I've been using stash this whole time... it's more just laziness... :)", "group_id": 106, "id": 237054}]