Collaboration Flaws

We used GitHub and are still using GitHub to collaborate. Unfortunately, it is not always the easiest thing to collaborate on different computers. The problem lies within merging. In case you don't know, GitHub, and most other similar applications, allow for multiple people to work on a single project separately, and then combine their new versions using the power of merging. This way, a person can see the differences between two different versions and decide which change to add.

One thing that was a bit (well, very) problematic to us last year was that we'd use different styles of code. One person may do this:

if (condition) {

    //code

}

While another may do this:

if (condition) 

{

    //code

}

It is a pain to go through every single difference and say, oh, let's do it with/without the enter. So this year, we are planning to have a unanimous formatting preference. We are using Eclipse as our IDE for Java, so we are using a slightly changed version of the Eclipse [Built-In] formatting preference.