GIT merge while tryign to merge the ignored files

Question

I merged some of the files from Branch A to Branch B and later commit-ed on Branch B. Now I need to merge some other file and its not showing in the conflit list or Commit list but while I Compare these two branches I can see the difference in that particular file. What maybe the problem.

Is it because first time I ignored this file and committed the other files?

Please give some input

Answer 1

While you can ignore files during a merge, you equally can unignore them, merge again, and resolve conflicts.

But remember the git svn caveat:

For the sake of simplicity and interoperating with Subversion, it is recommended that all git svn users clone, fetch and dcommit directly from the SVN server, and avoid all git clone/pull/merge/push operations between Git repositories and branches