search

okfn-brasil / vitimas-da-intolerancia

Conheça as vítimas de ódio político
https://vitimasdaintolerancia.org/
GNU Lesser General Public License v3.0
101 stars 10 forks source link

Issue #24 #29

Closed ellisonleao closed 6 years ago

ellisonleao commented 6 years ago

Ref: #24

ellisonleao commented 6 years ago

Many thanks @ellisonleao. I think your reference branch is outdated, or is there a little mess in you current branch. The diff (re)creates a complete new index.html. In our master this file have been renamed to home.html – can you double check it, please?

yeah it was outdated. I've used the fetch command to get the latest from the remote and merge with my current one. the index.html file got inserted again not sure why. i just removed in another commit. Do you want to squash everything and get this PR into a single commit?

cuducos commented 6 years ago

Do you want to squash everything and get this PR into a single commit?

I think that's a good idea indeed. Can you rebase it locally and push -f ?

ellisonleao commented 6 years ago

@cuducos done. i Just left the upstream merge commit if that's okay. Anything else you need?