Demo for managing conflict in eclipse while using git.