In this post, we will show you how to resolve Merge Conflicts in Git. Git allows developers to create branches from the main codebase to make independent changes. These changes can then be merged into ...

In previous Wazi articles we’ve looked at using Eclipse with the Subversion source code management tool – but increasingly, Subversion is being left behind as developers move to Git. If you and your ...