Why shall there be a conflict?
- you created
hi.txt
inmaster
- you created a new branch
newb
and modifiedhi.txt
- you switch back to
master
and the changes done innewb
are merged intomaster
That's the way it should work. We're not using SVN, eh?
Things could be different if you changed hi.txt
in master
after creating newb
: this would lead to a state where there are modifications on both branches.
But your workflow described above shall not lead to any problems.
Have a deeper read about branching and merging in the Git Book:
http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging
Edit: According to your comment, you only want to know which files are different between master
and newb
. This can easily be achieved using
git diff --name-only master newb