When I do a git merge I see the merge changes in terms of plus and minus signs.
e.g.
test.php | 23 +++++++-----What does it indicate? I guess it displays plus and minus signs per addition/deletion. But my question is what if there are 1000 additions and deletions? How does git handle this?
This is the output from git diff --stat
It indicates the changes like you've said it already.
git diff --stat is console width agnostic. It's either the exact amount of changes or it's just a percentage of changes.
Given git diff --stat -w100 and you are diffing 2 files width 1000 changes, then the output will be blurred, to fit into 100 chars output. Not sure how to explain it better.
Jan Vladimir Mostert
Idea Incubator
The
+and-signs are additions and deletions, to see what happens when I make a 1000 lines of changes, I've typed 5 new lines in a file, copied the block 10 times to create 50 lines, copied that new block 5 times to create 250 lines and copied the 250 line block 4 times to get to a 1000 new lines.This is the result after the merge:
As you can see a lot more
+signs than normally (approximately 185), not a 1000+signs, but it filled the entire width of the screen to show that it's a big change.