latest 20 messages by aberrant

+ [2015-11-28T00:14:11Z] aberrant yup, ok, that works. sorry to have bothered y'all
+ [2015-11-28T00:12:05Z] aberrant er, that is, http://stackoverflow.com/questions/6248231/git-rebase-after-previous-git-merge
+ [2015-11-28T00:11:53Z] aberrant ah, perhaps rebase after merging from master
+ [2015-11-28T00:10:12Z] aberrant that particular commit was merged in from master.
+ [2015-11-28T00:08:46Z] aberrant three items show up; I try to squash the last two
+ [2015-11-28T00:08:37Z] aberrant when I do a git rebase -i HEAD~2
+ [2015-11-28T00:08:25Z] aberrant it just says "error: could not apply 4a1326a... improvements in random graph generation"
+ [2015-11-28T00:05:52Z] aberrant got a quick question: I have a bunch of commits that include merging back things from master. I'd like to squash them, but rebase doesn't work. Any ideas?
+ [2015-09-08T16:43:31Z] aberrant ah, got it: git merge --no-commit --no-ff origin/master
+ [2015-09-08T16:42:47Z] aberrant I don’t want to make any changes to my local repo just yet.
+ [2015-09-08T16:41:55Z] aberrant is there a way to find the merge conflicts without actually doing the merge?
+ [2015-08-19T21:52:35Z] aberrant SOIP worked. you got a delayed ACK, is all.
+ [2015-08-19T21:52:19Z] aberrant downboated.
+ [2015-08-19T21:50:48Z] aberrant sorry. I had that in my paste buffer just in case.
+ [2015-08-19T21:50:38Z] aberrant I know, VxJasonxV :)
+ [2015-08-19T21:50:24Z] aberrant submitted an hour ago by cenal to /r/programming
+ [2015-08-19T21:50:23Z] aberrant The Job Search Process is Broken From Start to Finish (blog.joinjune.com)