Add instructions for handling merge conflicts during null merges.
Add instructions for handling merge conflicts during null merges.

jeff5/jython-devguide,jython/devguide,jeff5/jython-devguide,jython/devguide,jython/devguide,ezio-melotti/devguide,jeff5/jython-devguide