Identifying GIT Merge Conflicts with a Merge Tool

One of the pain points in GIT was resolving merge conflicts. I have highlighted ‘was’ because at the end of this blog you will find your life easy the next time you encounter merge conflicts. Working with GIT in agile development increases the probability of merge conflicts, and the reason behind is straight forward – Parallel [...]

Developing portlets using Spring Portlet MVC and Liferay ServiceBuilder

In my current project, I was exploring options to use a framework to develop portlets in Liferay portal. Finally, we decided to use Sprint Portlet MVC. We were successful in developing data driven portlets using Spring Portlet MVC and Hibernate. However, we were told to use Liferay ServiceBuilder to develop services instead of Spring and [...]