towski: Makefiles are one of the very few things that actually care about tabs-versus-spaces, and in theory, anyone who uses a Makefile should know that
+[2014-10-20T00:01:14Z]gshmuI'm using rebase, rebase master to my branch, and then push my branch, show ! [rejected] ... +[2014-10-20T00:01:41Z]gshmuwhat should i do? +[2014-10-20T00:06:00Z]offby1gshmu: "git pull --rebase" +[2014-10-20T00:06:49Z]gshmuoffby1: I fetched master and then at my branch rebase master. +[2014-10-20T00:07:52Z]offby1gshmu: perhaps you need to fetch the _other_ branch too