search

qwat / QWAT

TEKSI Water module (project QWAT) - QGIS project
https://www.teksi.ch
GNU General Public License v2.0
58 stars 31 forks source link

Ignore thumbs.db files created on windows #106

Closed ponceta closed 8 years ago

ponceta commented 8 years ago

I would be glad to squash these commits but I do not yet know how to do it.

3nids commented 8 years ago

git log --oneline shows you the list of commits then you can do git rebase -i _commitid_ to edit commits after commitid (if you want to include commitid you need to do git rebase -i _commitid_^ )

anyway, you shouldn't have PR in there. you can work directly on your master (VilleDePully/master) and then PR to main repo qwat/qwat... or even better, create a branch VilleDePully/myfix and then PR to main repo.

tell me if you want to do it yourself and update this PR*, or I'll squash your commits while merging.

*if you push (you'll need push --force) to your master, this PR will be automatically updated.

ponceta commented 8 years ago

:) ty for the tipps

Actually I created a branch on VilleDePully/poa_ignore_thumbsdb before merging into VilleDePully/master, but since I found that it could be useful for any user it pulled it to here.

Next time I'll pr the branch to be tested if I found a new general fix/update useful for all.

I've squashed the commits. So you're free to merge.