+[2014-10-19T21:18:22Z]greenrideI see. Thanks Nevik +[2014-10-19T21:18:29Z]Neviksure :) +[2014-10-19T21:18:41Z]greenride:) +[2014-10-19T23:31:44Z]benzhninjajoin the official MS Office channel today! ##ms-office +[2014-10-19T23:33:27Z]offby1<-<
message no. 54471
Posted by Nevik in #github at 2014-10-19T21:18:29Z
sure :)
+[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