Yes. When you "resolve" "conflicts" you can add any changes you like. This means reading it you need to understand ++ -- +- -+ or to compare it to both parent

Yes. When you "resolve" "conflicts" you can add any changes you like. This means reading it you need to understand ++ -- +- -+ or to compare it to both parents and their parents to see what exactly was added. For example I recently had to do something with ffmpeg commit 522f87708653af3badcdc33be983bcc6009de49b which basically rewrites the code it is supposed to be merging. Fortunately for that commit it makes most sense to only compare it with its first parent. Things like that make me strongly prefer rebase.