thekoushik/safe-merge-files

Merge two files like git

safe-merge-files's Issues

New file always overwrites old file

There is no actual merge taking place. The new file simply always overwrites old file.

Wrongly auto-resolving or marking conflicts, looping them very badly

Whenever I try to merge a file, with the auto-resolve forcing to true, a bug appears:

New file

{
      component: "TXSimpleText",
      props: {
        size: "md",
        textAlign: "center",
        fontStyle: "bold"
      },
      text: "Hola, bienvenido(a)sss"
}

Old file

{
      component: "TXSimpleText",
      props: {
        size: "md",
        textAlign: "center",
        fontStyle: "bold"
      },
      text: "Hola, bienvenido(a)s"
}

Results into:

{
      component: "TXSimpleText",
      props: {
        size: "md",
        textAlign: "center",
        fontStyle: "bold"
      },
      text: "Hola, bienvenido(a)s"
    },
      text: "Hola, bienvenido(a)s"
      text: "Hola, bienvenido(a)s"
    {
      text: "Hola, bienvenido(a)s"
      text: "Hola, bienvenido(a)s"
      text: "Hola, bienvenido(a)s"
      component: "TXSimpleText",
      text: "Hola, bienvenido(a)s"
      text: "Hola, bienvenido(a)s"
      text: "Hola, bienvenido(a)s"
      text: "Hola, bienvenido(a)s"
      props: {
      text: "Hola, bienvenido(a)s"
      text: "Hola, bienvenido(a)s"
      text: "Hola, bienvenido(a)s"
      text: "Hola, bienvenido(a)s"
        size: "sm",
      text: "Hola, bienvenido(a)s"
      text: "Hola, bienvenido(a)s"
      text: "Hola, bienvenido(a)s"
      text: "Hola, bienvenido(a)s"
        textAlign: "center",
      text: "Hola, bienvenido(a)s"
      text: "Hola, bienvenido(a)s"
      text: "Hola, bienvenido(a)s"
      text: "Hola, bienvenido(a)s"
        fontStyle: "bold",
        color: "light",
        paddingBottom: "16px"
      }
}

And it keeps repeating.

And when I try to merge with force as false, something similar happens but like this:

<<<<<<< HEAD
                text: "Hola, bienvenido(a)s"
=======
                text: "Hola, bienvenido(a)sss"
>>>>>>> New-HEAD
              },
<<<<<<< HEAD
                text: "Hola, bienvenido(a)s"
=======
                text: "Hola, bienvenido(a)sss"
>>>>>>> New-HEAD
              {
<<<<<<< HEAD
                text: "Hola, bienvenido(a)s"
=======
                text: "Hola, bienvenido(a)sss"
>>>>>>> New-HEAD
                component: "TXSimpleText",
<<<<<<< HEAD
                text: "Hola, bienvenido(a)s"
=======
                text: "Hola, bienvenido(a)sss"
>>>>>>> New-HEAD