The border conflict erupted in May when the armed forces of Thailand and Cambodia briefly fired at each other in a relatively small “no man’s land” claimed as their own by both countries.