While the basic work cycle of update
/resolve
/commit
in Subversion is easy peasy for almost everyone, merge
is a lot more confusing. This post shows how the common merging tasks can be accomplished using Subclipse in Eclipse with the understanding of the merging in terms of fundamental Subversion functionalities.