Skip to content

Add JuliaFormatter to workflow #1401

Open
@st--

Description

@st--

yeah we should add JuliaFormatter to this. It would be good to merge as many PRs as possible before because it will create conflicts all over

Originally posted by @matbesancon in #1283 (comment)

NB- the following workflow should only have a minimal amount of pain involved in each remaining open PR, assuming format(".") on master is committed as a single commit tagged format_commit:

  1. git checkout feature_branch
  2. git merge format_commit^ (no conflicts, or actual content conflicts that must be resolved should be handled here)
  3. julia -e "using JuliaFormatter; format("."); git commit -am "PR format"
  4. git merge format_commit; git checkout --ours .; git commit -a (we know the only diff is the formatting, so it's safe to blanket-accept the local branch side)
  5. git merge master (should apply cleanly now)

Of course, PRs that would be straightforward to merge should probably be merged first. Here's a (not necessarily 100% correct nor complete) list of the ones that seem like they mostly need a "click merge":

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions