Document upstream merge strategy