Merging offline files with GitHub