Ignore files during merge – Git

Recently I came across a situation where I had to ignore few files during a merge. All I had to do was to reset and checkout file again as shown here

git merge --no-commit <merge-branch>
git reset HEAD myfile.txt
git checkout -- myfile.txt
git commit -m "merged <merge-branch>"
Source: http://stackoverflow.com/questions/15232000/git-ignore-files-during-merge

SchemaSpy – ERDiagrams tool

SchemaSpy may not be a very well-known tool but it generates quite handy Enterprise Relationship (ER) diagrams. It works with just about any JDBC-compliant database (Oracle/MySQL/DB2/SQL Server/PostgreSQL/Sybase/etc.) though I tested only on MySQL.

This may not be the best tool but it’s free and comes with some cons. I didn’t find any maven project for this so no maven dependency available yet.

Continue reading

Ours – Git merge strategy to overwrite a branch

Without going into much details about git, I would like to share ‘Our’ merge strategy to overwrite a branch x with branch y. This can be useful when you have a situation where you have a feature branch let’s say feature/AccessRights-Jira-234 and a develop branch where there hasn’t been any extensive work on it. And you basically want to overwrite develop branch with you new branch. Continue reading

SOAP UI settings

Target audience: Developers/Testers who have been using SOAP UI.

soapui_logo

 

 

 

When working with several environments dev/test/verification/production it is recommended to have good control on the settings being used to run the SOAP UI application. You would like to avoid sending test data against production server since you had wrong settings.  How?

Continue reading

Devoxx 2015 Belgium

Devoxx 2015 Belgium

Devoxx 2015 Belgium

“20 Years of Java” is the theme of the ongoing Java conference in Belgium at Devoxx. And during the past few years Kentor has always made it a point to send atleast two developers at these kind of conferences. So here we are again. At #Devoxx the focus is on Java and related technologies, talks are interesting with good content which motivates us to come all the way from Stockholm to Antwerpen. Continue reading