git config pull.rebase false # Combines your local unpublished changes with latest change on remote ;)