Merged
Conversation
Contributor
|
You should make this PR against the 4.04 branch, not trunk. |
Contributor
Author
|
Does it really matter ? I would expect one branch to merge it, the other one to cherry-pick the commit... |
Contributor
|
@damiendoligez : what's your preference? I would expect that things intended to go to 4.04 should go to that branch directly, and that branch will be directly merged in trunk at some point. This avoids some manual work to identify which commits to cherry-pick (moreover, my understand is that git cannot really track cherry-picking, contrary to SVN, which increase the risk of conflict upon merges). |
Contributor
Author
|
@alainfrisch After discussion with @damiendoligez , the preferred process is to merge into trunk, and to cherry-pick commits to 4.04 (or vice-versa). |
Member
|
git does track cherry-picking well enough. |
camlspotter
pushed a commit
to camlspotter/ocaml
that referenced
this pull request
Oct 17, 2017
…tsuite 2 fixes for 4.04
stedolan
pushed a commit
to stedolan/ocaml
that referenced
this pull request
Sep 21, 2022
stedolan
pushed a commit
to stedolan/ocaml
that referenced
this pull request
Sep 21, 2022
ce76e02 flambda-backend: Bugfix for type_application (ocaml#746) 44f3afb flambda-backend: PR580 for main branch (ocaml#743) b851eaa flambda-backend: Backport first part of ocaml/ocaml PR10498 (ocaml#737) fafb4bd flambda-backend: Fix return mode for eta-expanded function in type_argument (ocaml#735) c31f6c3 flambda-backend: Fix treatment of functions called [@nontail] (ocaml#725) 847781e flambda-backend: Fix build_upstream post-PR703 (ocaml#712) bfcbbf8 flambda-backend: Extend Pblock value kind to handle variants (ocaml#703) b2cab95 flambda-backend: Merge ocaml-jst a6d6e0e flambda-backend: Merge ocaml-jst 88a4f63 flambda-backend: Use Pmakearray for immutable arrays (ocaml#699) eeaa44b flambda-backend: Install an ocamldoc binary (ocaml#695) 48d322b flambda-backend: Ensure that GC is not invoked from bounds check failures (ocaml#681) 4370fa1 flambda-backend: Review changes of term directory (ocaml#602) 65a4566 flambda-backend: Add code coverage using bisect_ppx (ocaml#352) 63ab65f flambda-backend: Bugfix for primitive inclusion (ocaml#662) 7e3e0c8 flambda-backend: Fix inclusion checks for primitives (ocaml#661) 96c68f9 flambda-backend: Speed up linking by changing cmxa format (ocaml#607) 1829150 flambda-backend: Bugfix for Translmod.all_idents (ocaml#659) git-subtree-dir: ocaml git-subtree-split: ce76e02
sadiqj
pushed a commit
to sadiqj/ocaml
that referenced
this pull request
Feb 21, 2023
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.