GIT- Rebase a branch to fix a conflict

To manually rebase. If I want to merge, but there are conflicts:

- on feature branch:

git rebase master

- read the conflicting files. Open it and fix it. Then:

git add modified_file

git rebase --continue

- repeat until no more conflicts, then:

git push --force

Postgres output to CSV with special characters

\copying a table to csv and you want to open in Excel, specifying

WITH(format csv, encoding 'latin1', header true)

results in correct special characters.