+ [10 years ago] doubled but the owner said this: I think you need to merge master into your branch and resolve the conflicts
+ [10 years ago] doubled locally I have everything up to date
+ [10 years ago] doubled this is really akward
+ [10 years ago] pcat doubled: maybe the "up to date" project has not finished merging?

message no. 92285

Posted by doubled in #github at 2015-05-05T23:56:22Z

locally I have everything up to date
+ [10 years ago] pcat VxJasonxV: ?
+ [10 years ago] doubled what do you mean?
+ [10 years ago] doubled can I tell you what I did?
+ [10 years ago] pcat doubled: meaning perhaps you pulled it during an incomplete state
+ [10 years ago] doubled first, I created a branch and made some changes, pushed them to master (but not merging to master)