+ [2014-09-12T20:02:58Z] sdegutis I can do that way.
+ [2014-09-12T20:38:41Z] Ch3ck_ In a case of the git merge where conflicts come up
+ [2014-09-12T20:39:19Z] Ch3ck_ How do you resolve these conflicts probably giving priority to a particular branch
+ [2014-09-12T20:39:43Z] Ch3ck_ since it sounds to me resolving these conflicts file by file is going to be very tedious
+ [2014-09-12T20:40:00Z] Ch3ck_ since they're more than 20 i think

message no. 47380

Posted by sdegutis in #github at 2014-09-12T20:02:56Z

Oh nice: Dash has a popup that says "How would you like to contact me?" with "Twitter" and "Email" being the two options (or Cancel of course).
+ [2014-09-13T00:42:08Z] VxJasonxV so the question is why fetching from upstream isn't bringing them in
+ [2014-09-13T00:42:36Z] VxJasonxV I really hate cloning this repository
+ [2014-09-13T00:42:41Z] VxJasonxV it needs to be like 70% smaller
+ [2014-09-13T00:43:05Z] tieTYT2 hah seriously
+ [2014-09-13T00:43:31Z] tieTYT2 I'm going to do this: git fetch upstream --tags