+[2014-09-12T20:02:58Z]sdegutisI 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
Can someone confirm that the change tag drop down here doesn't contain a v0.8.0? https://github.com/dukedave/grape
+[2014-09-13T00:42:08Z]VxJasonxVso the question is why fetching from upstream isn't bringing them in +[2014-09-13T00:42:36Z]VxJasonxVI really hate cloning this repository +[2014-09-13T00:42:41Z]VxJasonxVit needs to be like 70% smaller +[2014-09-13T00:43:05Z]tieTYT2hah seriously +[2014-09-13T00:43:31Z]tieTYT2I'm going to do this: git fetch upstream --tags