Skip to content
Snippets Groups Projects
Commit 0b6f12495276 authored by Bryan O'Sullivan's avatar Bryan O'Sullivan
Browse files

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.
parent b193a6e59131
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment