Add the right m-l ... -Daniel On Wed, Dec 12, 2018 at 3:33 PM Boris Brezillon <boris.brezil...@bootlin.com> wrote: > > On Wed, 12 Dec 2018 15:08:28 +0100 > Daniel Vetter <daniel.vet...@ffwll.ch> wrote: > > > Boris needs this. > > > > v2: Improve the text for all cases that need manual fixups. > > > > Cc: Rob Clark <robdcl...@gmail.com> > > Cc: Boris Brezillon <boris.brezil...@bootlin.com> > > Signed-off-by: Daniel Vetter <daniel.vet...@intel.com> > > Reviewed-by: Boris Brezillon <boris.brezil...@bootlin.com> > Tested-by: Boris Brezillon <boris.brezil...@bootlin.com> > > > --- > > drm-tip.rst | 32 ++++++++++++++++++++++++++++++++ > > 1 file changed, 32 insertions(+) > > > > diff --git a/drm-tip.rst b/drm-tip.rst > > index 002246f573e3..e38f59df1e3f 100644 > > --- a/drm-tip.rst > > +++ b/drm-tip.rst > > @@ -132,3 +132,35 @@ best way to go about this is: > > smoothly, at least for this merge:: > > > > $ dim rebuild-tip > > + > > +Fixing Silent Conflicts > > +----------------------- > > + > > +A really annoying case is when a merge has a silent conflict, i.e. git > > merge > > +succeeds, but the resulting source fails to compile or run. Often this > > happens > > +when one branch changes a function or structure, while a 2nd branch adds a > > new > > +user. The important part is to make sure we supply the fixup patch for the > > right > > +merge commit. > > + > > +1. Identify the merge that breaks the build. > > + > > +2. Rebuild drm-tip in interactive mode, and stop until the broken merge > > has been > > + done:: > > + > > + $ dim -i rebuild-tip > > + > > + Stop the rebuilding of drm-tip by hitting ^C. > > + > > +3. Resolve the conflict normally, but don't stage it or commit it in any > > + fashion. Check that the resolution looks correct:: > > + > > + $ git diff > > + > > + Of course also make sure it actually builds/works. Then store it as a > > manual fixup patch:: > > + > > + $ git diff | dim cat-to-fixup > > + > > +4. Finally rebuild the integration tree, which should now result in a > > working > > + tree with no broken merges:: > > + > > + $ dim rebuild-tip >
-- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
