there should be a single button that lets you merge this pull request, and then on your end you need to pull from your repo (git pull origin master). if you've made changes locally, they'll conflict. because of the formatting changes it will be hard to merge by hand, so i recommend just doing a new git clone and adding the changes in again.
there should be a single button that lets you merge this pull request, and then on your end you need to pull from your repo (git pull origin master). if you've made changes locally, they'll conflict. because of the formatting changes it will be hard to merge by hand, so i recommend just doing a new git clone and adding the changes in again.