latest 2 messages by jayeshsolanki

+ [2015-06-03T03:14:04Z] jayeshsolanki ok it was fetch and merge, thanks :)
+ [2015-06-03T03:04:35Z] jayeshsolanki I forked a jekyll blog a few months ago and pushed a few commits to my blog. Now the original repo has new commits and I want to merge them to my repo. What;s the best way to do this?