www.nadeeth.info

Few weeks a go, I was doing some source code merging works. Some features developed in some branches of the repository were merged into some other branches. For the simple merging tasks, we directly use the "svn merge" command. But, in most of the times, we can't achieve what we need just using the "svn merge". That is, because the branches we do the merging between, have been grown largely, and independently.

For these situations, we have to use a good merging tool such as "Meld". Actually, this is the best tool I have ever seen for this task.

"Meld is a visual diff and merge tool. You can compare two or three files and edit them in place (diffs update dynamically). You can compare two or three folders and launch file comparisons. You can browse and view a working copy from popular version control systems such such as CVS, Subversion, Bazaar-ng and Mercurial." [http://meld.sourceforge.net/]

When you merge some thing did by other person in …

These days, I am reading the book "Patterns of Enterprise Application Architecture - Martin Fowler".

In the introduction of the book there are some definitions about the terms such as Patterns, Enterprise Applications, and Architecture etc. The features of Enterprise software, and how they differ from other types of software are described in detail.

After the introduction, there are two main sections. The Narratives, and Patterns. The first section is a short tutorial on developing enterprise applications. The next section, is a detailed reference to the patterns themselves.

At the moment, I finished reading the Introduction and willing to start reading the first section.