On Tue, May 31, 2016 at 8:32 AM, Carlos O'Donell <carlos@redhat.com> wrote: > On 05/31/2016 11:01 AM, Paul Pluzhnikov wrote: >> git merge > ^^^^^^^^^^^ instead of merge rebase your local branch. > > e.g. git pull --rebase Thanks! I hope I'll remember this next time conflict happens. -- Paul Pluzhnikov