ssible to revert the merge without losing your local
            changes.</li>

            <li>Likewise, always commit the merge to your branch (after
            resolving any conflicts) before making any further changes.</li>
          </ul>
        </li>

        <li>Don't include unrelated changes. If you want to make some changes
        which aren't really associated with your other changes then use a
        separate ticket and branch for these changes.</li>
      </ul>
    </li>

    <li>Once your 