Today I faced a little confusion in the subversion conflicts which has made by myself in between last two versions.
This blog helped to resolve this conflict issue.
Svn is something different from git.
I was worked more conflicts thing in git. But this first time I am getting conflicts in svn in the past 6 months.
Hmmm. Oops, past 6 months I didnt get conflicts, because I am only the developer in our IITD – NCMRWF project. 🙂 🙂