Skip to main content

Restrictions

  • The merge method supports only 3-way merge (2-way merge is not supported).
  • There is no dedicated UI for difference display, conflict resolution, etc. It is a command line tool.
  • Server-side merging (automatic interlocking with pull request merging) is not supported.
    • After merging locally, issue a pull request and merge the pull request.