learning stash
stashing
resolving conflict
git rebase