Merging changes after introduction of formatting guidelines

If you forked and modified Soot before the introduction of our coding-style guidelines, you might want to take this in to account before merging:

Git should be able to automatically merge all formatting changes to files that weren't touched in your version of Soot's codebase. Also, files with small changes should be easy to merge. However, if you made huge changes to some files, it might make more sense to throw away the remote files, keep your own versions and apply the auto formatting to your files afterward.

1. Pull the commit previous to our formatting commit: git pull 5c8bfba2594942e89be978167febf533177879bd
2. Merge your code with the remote code using a merge tool
3. Pull our formatting changes git pull ae1cf8c4126771873414a127b89e59d0ba4c0d57 and manually merge small changes but throw away remote files with a large number of changes (keeping your own).
4. Apply formatting as stated in our formatting tutorials (Eclipse, IntelliJ Idea)
5. Validate the state of your revision with mvn validate and fix potential styling issues
6. Pull and merge changes after the formatting commit git pull