On 12/04/2017 09:38 AM, Patrick Schluter wrote: > So, avoid pull, look first what fetch does and if that is what you > thought it would do, do the merge and be happy. +1 Paraphrasing someone I trust very much, "Never 'pull', always 'fetch -p' and then rebase." Ali