**** '''prefer rebase for updating local sources with remote changes; prefer merge for merging one remote branch into another remote branch''' | **** '''prefer rebase for updating local sources with remote changes; prefer merge for merging one remote branch into another remote branch''' |