I am trying to understand how git work with conflicts
i tried this test.
created a directory called test
vi newfile (add "First")
git add .
git commit -m "first commit"
git checkout -b bri
switched to bri branch from master.
vi newfile(add "second" in the first line)
git commit -m "second commit")
Now when i tried to merge it didn't complain any conflicts. its updated the latest information on the first line. This is not what i was expecting . I wanted to see the conflict information before it merges.