GIT: reuse information about recent conflict resolutions