Git scenarios and resolutions