This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: Merge commits to master?
- From: Paul Pluzhnikov <ppluzhnikov at google dot com>
- To: "Carlos O'Donell" <carlos at redhat dot com>
- Cc: Adhemerval Zanella <adhemerval dot zanella at linaro dot org>, GLIBC Devel <libc-alpha at sourceware dot org>
- Date: Tue, 31 May 2016 08:36:19 -0700
- Subject: Re: Merge commits to master?
- Authentication-results: sourceware.org; auth=none
- References: <bug-19653-131 at http dot sourceware dot org/bugzilla/> <bug-19653-131-2n21YgNOot at http dot sourceware dot org/bugzilla/> <574DA130 dot 2070505 at redhat dot com> <574DA263 dot 7090506 at linaro dot org> <CALoOobNYT0a53v8kZ0apmOgOe6dLzfPYwqLPSAOBdK8iMfGvUg at mail dot gmail dot com> <574DAE7D dot 3000400 at redhat dot com>
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