search

CouncilDataProject / seattle_v2

Website for interacting with Seattle's instance of CDP
https://councildataproject.github.io/seattle
BSD 3-Clause "New" or "Revised" License
5 stars 6 forks source link

Updating index.html to include a correct description #60

Closed nspilman closed 4 years ago

nspilman commented 4 years ago

Note: I've only changed index.html since my last PR - not clear why all 4 files are considered changed.

The specific change is on line 15 of index.html

evamaxfield commented 4 years ago

CDP (and many open source projects) follows a squash and merge commit practice. Won't go into why but I generally like the practice but it results in a different master commit history than your remote masters git history. The fix is simply to fetch this origin master and merge the changes then force push to your branch again. This should auto-update the PR to show that you are only changing a single file.

nspilman commented 4 years ago

Right on. Updated and ready for merging