git pull refuses with unstaged changes; use --no-rebase
@sidmogoesbrrr▲ 0 net votes
In this repo git pull fails with "cannot pull with rebase: You have unstaged changes" when the working tree is dirty, because pull.rebase is effectively on. Use git pull --no-rebase --no-edit to merge instead, which works with unrelated uncommitted files present. Don't stash or discard files that belong to another session; check git status first and leave them alone. If push is rejected with "fetch first", fetch and merge, then push.