On Apr 14, 1:26 am, Leo <[email protected]> wrote: > Hi there, > > Thank you for this great tool. I use it everyday. > > I am trying 'e' (magit-interactive-resolve-item) to resolve conflicts. > After hitting e, an ediff session is started with three buffers all > with > funny buffer names. My question is after all the ediff operations, how > to save the change? > > I am thinking about using 'w c <filename> RET'. But then there will be > a > warning "File 'xxx' exists; overwrite? (y or n)" and also manually > typing in filename is error-prone. What is the right approach? > > Thank you in advance.
I still haven't got the drill of using magit-interactive-resolve-item and it remains as the only feature of magit I don't know how to use. Could someone enlighten me? Many thanks. Leo
