fetch: switch the default parent used for a merge
This treats newly pulled changes as authoritative, and local changes as the "satellite" changes. The prior default behaviour is still available, via the --switch-parent option.
Loading
Please register or sign in to comment