.gitconfig: mergeconflict resulution handling

Signed-off-by: Erik Bernoth <erik.bernoth@gmail.com>
.gitignore added

to ignore the vim undo files.

Signed-off-by: Erik Bernoth <erik.bernoth@gmail.com>