Merging. Rebasing. Stashing