search

fossasia / gci17.fossasia.org

FOSSASIA Google Code-In Website 2017/18 https://gci17.fossasia.org
GNU Lesser General Public License v3.0
1.59k stars 204 forks source link

Fixes #923: Added a Blog #924

Closed NaviRocker closed 6 years ago

NaviRocker commented 6 years ago

Fixes #923 Added a New Blog to Blog Section

rupav commented 6 years ago

Resolve conflicts to get it merged.

NaviRocker commented 6 years ago

Done @rupav

rupav commented 6 years ago

Please squash it too.

NaviRocker commented 6 years ago

@rupav I committed the changes in Github Web. Please Squash and Merge it. Sorry!

rupav commented 6 years ago

You can still squash using git. git pull origin And then squash using git.

NaviRocker commented 6 years ago

@rupav It shows that it is Up to Date when i do it.

rupav commented 6 years ago

Is there any branch patch-1 locally ?? Check using git branch . If not add patch-1 as a branch. Then pull again, git pull origin patch-1 patch-1. Then squash.

NaviRocker commented 6 years ago

@rupav Still I get Others Files

rupav commented 6 years ago

git log --graph to see what commits need to be squashed. Then use squash commands to squash with your PR. Post a screenshot wherever you face difficulty.