How to resolve conflicts in subversion

Dear All,

Today I faced a little confusion in the subversion conflicts which has made by myself in between last two versions.

http://ariejan.net/2007/07/04/how-to-resolve-subversion-conflicts/

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. 🙂 🙂

Advertisements

About arulalant

Currently working as "Project Scientist – C" in National Centre for Medium Range Weather Forecasting (NCMRWF), MoES, Noida, India
This entry was posted in Linux and tagged , . Bookmark the permalink.

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s