Re: merge command, showing conlict when successfull merge expected

--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

() Alejandro Fernandez <[email protected]>
() Tue, 3 Mar 2020 11:14:13 -0300

   To report this issue.
   Let me know if there are any comments.

IIUC, the merge command is working as expected.

   ---- command ----
   vagrant@local2:~/temp/merges/example008$ merge -p source-vim.json
   base-vim.json target-vim.json
   <<<<<<< source-vim.json
   start emailsource
   success email
   =3D=3D=3D=3D=3D=3D=3D
   start email
   success emailtarget
   >>>>>>> target-vim.json
   merge: warning: conflicts during merge

   ---- expected result ----
   No merge conflicts.

   ---- expected outcome ----
   start emailsource
   success emailtarget

   ---- file contents ----
   vagrant@local2:~/temp/merges/example008$ cat base-vim.json
   start email
   success email
   vagrant@local2:~/temp/merges/example008$ cat source-vim.json
   start emailsource
   success email
   vagrant@local2:~/temp/merges/example008$ cat target-vim.json
   start email
   success emailtarget

Why do you expect there to be no merge conflicts?

=2D-=20
Thien-Thi Nguyen

--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iG4EARECAC4WIQR0jqDoHLinSJv6bORnAyIkTIB1AgUCX3tq+RAcdHRuQGdudXZv
bGEub3JnAAoJEGcDIiRMgHUCrEcAn31kotqWx01H7lr0+mL7/gg0dcfQAJ9SbL/d
rctSkNmRAY6CDoWVoRzXBQ==
=mbKv
-----END PGP SIGNATURE-----
--=-=-=--