Problem when merging

Asked

Viewed 146 times

2

I’m doing merges, and in this action, accented characters are being swapped for symbols, I still don’t know what the source of the problem is, if it’s the encoding of the files, or if the problem is in git, can anyone help me? Below is an example of code that happened after I rewired a merge between two branches.

Ex

log.warn("Tentou pegar anexos de análise inexistente");

log.warn("Tentou pegar anexos de an�lise inexistente");

1 answer

1


If you’re seeing one file with the right accent and another with the wrong accent in the same merge, it’s probably not a problem with Git.

Git can change the form of file lines breaking (CRLF vs LF), but does not change accentuation.

It is quite likely that someone has comited a file with incorrect encoding. Check the source of the file with the accentuation problem and, if necessary, ask the developer who made the change to match the encoding of your development IDE.

  • 1

    The problem is exactly this, different encoding , in the git UTF-8 repository in IDE CP1252. When viewing the file after merging modifications the IDE does not recognize the accents. Thank you

Browser other questions tagged

You are not signed in. Login or sign up in order to post.