lkml.org 
[lkml]   [2021]   [Jun]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: rebase and update of the gfs2 tree
Hi all,

On Fri, 11 Jun 2021 08:11:35 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> So yesterday I reported a conflict between the vfs and gfs2 trees.
> Today it has been "fixed" by the gfs2 tree rebasing and merging a
> topic branch from the vfs tree. Unfortunately, that topic branch has
> been rebased in the vfs tree today, so now in linux-next I will have
> two (slightly different) versions of that vfs tree topic branch (and
> presumably I will get more conflicts).
>
> Please think about what is wrong with this situation. Hint: two already
> published branches have been rebased/rewritten. And maybe there has
> been a lack of communication between developers.

Please read Documentation/maintainer/rebasing-and-merging.rst

--
Cheers,
Stephen Rothwell
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2021-06-11 00:38    [W:0.060 / U:0.288 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site