correct comments
add resolve conflicts gui screen
add else block for sanitiy check on unexpected case
handle an aborted merge conflict resolution
Merge branch 'master' of https://github.com/Apelon-VA/ISAAC.git
just formatting
cleanup API naming
don't request commit message when nothing to commit, start handling
updates during sync
remove old TODO
quiet down logging, fix warnings
reorder buttons for consistency
quiet down jsch loggings, fix bug in the algorithm that lists files
changed in the commit.
Process changesets on startup.
process changesets on sync
add mojo for processing changesets during build
Merge branch 'master' of https://github.com/Apelon-VA/ISAAC.git