DOC: software-development: link to https://en.wikipedia.org/wiki/Merge_(revision_control)