Resolve lots of conflicts

janestreet · Nov 9, 2023 · 924d824 · 924d824
1 parent 75ee443
commit 924d824
Show file tree

Hide file tree

Showing 39 changed files with 11,692 additions and 52,888 deletions.
diff --git a/.github/workflows/ocaml-lsp-compat.yml b/.github/workflows/ocaml-lsp-compat.yml
@@ -1,11 +1,10 @@
-<<<<<<< HEAD
 name: Check ocaml-lsp compat
 
 # Controls when the action will run. Triggers the workflow on push or pull request
-# events but only for the master branch
+# events but only for the main branch
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
     paths-ignore:
       - '**.md'
       - '**.txt'
@@ -15,7 +14,7 @@ on:
       - 'vim/**'
       - '**/emacs-lint.yml'
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
     paths-ignore:
       - '**.md'
       - '**.txt'
@@ -57,64 +56,3 @@ jobs:
           opam --cli=2.1 pin --with-version=dev --no-action .
           opam install ocaml-lsp-server --with-test --ignore-constraints-on=merlin-lib
 
-||||||| b01e78e20
-=======
-name: Check ocaml-lsp compat
-
-# Controls when the action will run. Triggers the workflow on push or pull request
-# events but only for the master branch
-on:
-  push:
-    branches: [ 500 ]
-    paths-ignore:
-      - '**.md'
-      - '**.txt'
-      - '.git*'
-      - 'doc/**'
-      - 'emacs/**'
-      - 'vim/**'
-      - '**/emacs-lint.yml'
-  pull_request:
-    branches: [ 500 ]
-    paths-ignore:
-      - '**.md'
-      - '**.txt'
-      - '.git*'
-      - 'doc/**'
-      - 'emacs/**'
-      - 'vim/**'
-      - '**/emacs-lint.yml'
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
-  # This workflow contains a single job called "build"
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - ubuntu-latest
-        ocaml-compiler:
-          - 5.0.x
-    # The type of runner that the job will run on
-    runs-on: ${{ matrix.os }}
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
-
-      - name: Set up OCaml ${{ matrix.ocaml-compiler }}
-        uses: ocaml/setup-ocaml@v2
-        with:
-          # Version of the OCaml compiler to initialise
-          ocaml-compiler: ${{ matrix.ocaml-compiler }}
-
-      - name: Check that Merlin and OCaml-LSP are co-installable
-        run: |
-          opam depext conf-jq # opam depext bug
-          opam --cli=2.1 pin --with-version=dev --no-action https://github.com/ocaml/ocaml-lsp.git
-          opam --cli=2.1 pin --with-version=dev --no-action .
-          opam install ocaml-lsp-server --with-test --ignore-constraints-on=merlin-lib
-
->>>>>>> ups/501
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,129 +1,3 @@
-<<<<<<< HEAD
-merlin NEXT_VERSION
-===================
-
-  + merlin binary
-    - Fix a follow-up issue to the preference of non-ghost nodes introduced in #1660 (#1690, fixes #1689)
-  + editor modes
-    - vim: load merlin when Vim is compiled with +python3/dyn (e.g. MacVim)
-
-merlin 4.12
-===========
-Tue Sep 26 17:45:42 CEST 2023
-
-  + merlin binary
-    - Fix issue with let operators and tuples (#1684, fixes #1683, fixes
-      ocaml/ocaml-lsp#1182)
-    - Fix an issue causing Merlin locate queries to hang (#1686,
-      fixes ocaml/ocaml-lsp#1192)
-
-merlin 4.11
-===========
-Thu Sep 24 18:01:42 CEST 2023
-
-  + merlin binary
-    - Improve error messages for missing configuration reader (#1669)
-    - Fix regression causing crash when using ppxes under Windows (#1673)
-    - Fix confusion between aliased modules and module types (#1676,
-      fixes #1667)
-    - Ignore hidden branches when listing occurrences (#1677, fixes #1671)
-  + editor modes
-    - emacs: fix/improve keybindings (#1668, fixes #1386):
-      Unbind <kbd>C-c C-r</kbd> (to avoid shadowing `tuareg-eval-region`)
-      and bind <kbd>C-c C-v</kbd> instead to `merlin-error-check`;
-      rebind <kbd>C-c C-d</kbd> to `merlin-document`
-      and bind <kbd>C-c M-d</kbd> and <kbd>C-c |</kbd> instead to `merlin-destruct`;
-      bind <kbd>C-u C-c C-t</kbd> to `merlin-type-expr`.
-      See also <https://github.com/ocaml/merlin/issues/1386#issuecomment-1701567716>
-    - emacs: remove use of obsolete `defadvice` macro (#1675)
-
-merlin 4.10
-==========
-Thu Aug 24 17:17:42 CEST 2023
-
-  + merlin binary
-    - Constrain socket path buffer size to avoid build warnings (#1631)
-    - Handle concurrent server start (#1622)
-    - Omit module prefixes for constructors and record fields in the
-      `construct` command (#1618).  Prefixes are still produced when
-      warning 42 (disambiguated name) is active.
-    - Correctly invalidate PPX cache when pipeline ran partially (#1650,
-      fixes #1647)
-    - Prevent `short-path` from looping in some cases related to recursive type
-      definitions (#1645)
-    - Support parsing negative numbers in sexps (#1655)
-    - Fix construct not working with inline records (#1658)
-    - Improve behavior of `type-enclosing` on let/and operators (#1653)
-    - Fix occurrences of extension constructors (#1662)
-    - Improve node selection when ghosts are present (#1664, fixes #1660)
-  + editor modes
-    - emacs: call merlin-client-logger with "interrupted" if the
-      merlin binary itself is interrupted, not just the parsing of the
-      result (#1626).
-    - emacs: merlin-construct, with a prefix argument, now includes
-      local values in the completion options.  Alternatively, this
-      behavior can be enabled permanently by customizing
-      `merlin-construct-with-local-values` (#1644)
-    - emacs: add support for opam-switch-mode (#1654, fixes #1591).
-      See <https://github.com/ProofGeneral/opam-switch-mode>
-
-merlin 4.9
-==========
-Fri May 26 15:23:42 CEST 2023
-
-  + merlin binary
-    - Allow monadic IO in dot protocol (#1581)
-    - Add a `scope` option to the `occurrences` command in preparation for
-      the upcoming `project-wide-occurrences` feature (#1596)
-    - Construct bool-typed holes as `false` instead of `true` in the
-      `construct` command, for consistency (#1599).
-    - Add a hook to configure system command for spawning ppxes when Merlin is
-      used as a library. (#1585)
-    - Implement an all-or-nothing cache for the PPX phase (#1584)
-    - Cleanup functors caches when backtracking, to avoid memory leaks
-      (#1609, fixes #1529 and ocaml-lsp#1032)
-    - Fix `construct` results ordering for sum types sand poly variants (#1603)
-    - Fix object method completion not working (#1606, fixes #1575)
-    - Improve context detection for package types (#1608, fixes #1607)
-    - Fix incorrect locations for string literals (#1574)
-    - Fixed an issue that caused `errors` to erroneously alert about missing
-      `cmi` files (#1577)
-    - Prevent destruct from crashing on closed variant types (#1602,
-      fixes #1601)
-    - Improve longident parsing (#1612, fixes #945)
-  + editor modes
-    - emacs: call the user's configured completion UI in
-      `merlin-construct` (#1598)
-  + test suite
-    - Add missing dependency to a test using ppxlib (#1583)
-    - Add tests for the new PPX phase cache (#1584)
-    - Add and update tests for `construct` ordering (#1603)
-
-merlin 4.8
-==========
-Fri Feb 24 16:55:42 CEST 2023
-
-  + merlin binary
-    - Update internal typer to match OCaml 4.14.1 release (#1557)
-    - Improve type-enclosing behaviour when used on records' labels (#1565,
-      fixes #1564)
-    - Restore compatibility with some OCaml compiler's debug flags that were
-      incorrectly rejected by Merlin (#1556)
-    - Traverse aliases when jumping to declaration. This matches
-      jump-to-definition's behavior (#1563)
-    - Improve locate's behavior in various ill-typed expressions (#1546, fixes
-      #1567 and partially #1543)
-    - Correctly traverse patterns when looking for docs in the typedtree (#1572)
-    - Get documentation when the declaration or definition is selected (#1542,
-      fixes #1540)
-    - On Windows, change to a harmless directory when launching server to avoid
-      locking down current directory (#1569, fixes #1474)
-  + test suite
-    - Add multiple tests for locate over ill-typed expressions (#1546)
-    - Add non-regression tests for other fixes in this release
-
-||||||| b01e78e20
-=======
 merlin 4.12
 ===========
 Tue Sep 26 17:45:42 CEST 2023
@@ -262,7 +136,6 @@ Thu Dec 13 11:49:42 CEST 2022
       fixes #1518)
     - Mark some C variables as unused to remove warnings (#1541, @antalsz)
 
->>>>>>> ups/501
 merlin 4.7
 ==========
 Thu Nov 24 17:49:42 CEST 2022

diff --git a/README.md b/README.md
@@ -178,19 +178,9 @@ If you're a Merlin user and depend on our public API, we recommend that you cont
 Next Steps
 ==========
 
-<<<<<<< HEAD
-To use Merlin with a multi-file project, it is necessary to have a [.merlin](https://github.com/ocaml/merlin/wiki/project-configuration) file, 
-unless your project is built using Dune.
-Note that, in a project using Dune, user-created `.merlin` files will take precedence over the configuration provided by Dune to Merlin. 
-||||||| b01e78e20
-To use Merlin with a multi-file project, it is necessary to have a [.merlin](https://github.com/ocaml/merlin/wiki/project-configuration) file
-unless your project is built using dune.
-Note that, in a project using Dune, user-created `.merlin` files will take precedence over the configuration provided by Dune to Merlin. 
-=======
 To use Merlin with a multi-file project, it is necessary to have a [.merlin](https://github.com/ocaml/merlin/wiki/project-configuration) file
 unless your project is built using dune.
 Note that, in a project using Dune, user-created `.merlin` files will take precedence over the configuration provided by Dune to Merlin.
->>>>>>> ups/501
 
 Read more in the [wiki](https://github.com/ocaml/merlin/wiki) to learn how to make full use of Merlin in your projects.
 

diff --git a/bench.Dockerfile b/bench.Dockerfile
@@ -1,40 +1,3 @@
-<<<<<<< HEAD
-FROM ocaml/opam:ubuntu-20.04-ocaml-4.14
-
-WORKDIR /app
-
-RUN sudo apt-get update
-RUN sudo apt-get -y install jq
-COPY . .
-RUN sudo chown -R opam /app
-RUN eval $(opam env)
-
-# install merlin
-RUN opam install .
-
-# install merl-an
-## cache workaround: https://github.com/ocurrent/current-bench/issues/468#issuecomment-1621030354
-ADD https://api.github.com/repos/pitag-ha/merl-an/git/refs/heads/main .merl-an-info
-RUN opam pin -y merl-an https://github.com/pitag-ha/merl-an.git
-
-RUN eval $(opam env)
-
-# create directory for projects to run benchmarks on
-RUN sudo mkdir /projects
-RUN sudo chown opam /projects
-WORKDIR /projects
-
-# build irmin
-RUN git clone https://github.com/mirage/irmin.git
-WORKDIR /projects/irmin
-RUN git checkout 8da4d16e7cc8beddfc8a824feca325426bae08a9
-RUN sudo apt install -y gnuplot-x11 libgmp-dev pkg-config libffi-dev
-RUN opam switch import /app/bench/irmin.opam.export --no-checksums
-RUN opam exec -- dune build
-
-WORKDIR /app
-||||||| b01e78e20
-=======
 FROM ocaml/opam:debian-11-ocaml-5.0
 
 WORKDIR /app
@@ -69,4 +32,3 @@ RUN opam switch import /app/bench/irmin.opam.export --no-checksums
 RUN opam exec -- dune build
 
 WORKDIR /app
->>>>>>> ups/501
diff --git a/dot-merlin-reader.opam b/dot-merlin-reader.opam
@@ -11,13 +11,7 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
 ]
 depends: [
-<<<<<<< HEAD
-  "ocaml" {>= "4.08" & < "5.0"}
-||||||| b01e78e20
-  "ocaml" {>= "4.08" & < "5.0.0"}
-=======
   "ocaml" {>= "5.1" & < "5.2" }
->>>>>>> ups/501
   "dune" {>= "2.9.0"}
   "merlin-lib" {>= "4.9"}
   "ocamlfind" {>= "1.6.0"}