Trivadis Developer Blog
This is the publication playground for these guys from OIO Trivadis, the Trivadis Group`s Java experts.
Agile Methods and development Atlassian Tools Build, config and deploy Did you know? Eclipse Universe Groovy and Grails Java and Quality Java Basics Java EE Java modularization Java Persistence Java Runtimes - VM, Appserver & Cloud Java Web Frameworks MDSD Open Source BI Other languages for the Java VM Politics Security SOA / Webservices Spring Universe Web as a Platform XML Universe
Tag Archives: Merge Strategy
Although EGit is a nice tool for working with Git in Eclipse, it has the problem that its merge strategy differs from the strategy of the official Git command line client – until now. The Git command line client uses … Continue reading