jj operation log
○ d9eb6f6d9ac8 [email protected] 11 hours ago, lasted 1 millisecond
│ edit commit cbbb16fe8d90dfdc58342685bb120da77b01fe60
│ args: jj edit lrz
│
│ Changed commits:
│ ○ - roxxplny hidden a97d04be (empty) (no description set)
│
│ Changed working copy default@:
│ + lrzyoxlw cbbb16fe (empty) working copy
│ - roxxplny hidden a97d04be (empty) (no description set)
○ 0e41517a9529 [email protected] 11 hours ago, lasted 150 milliseconds
│ squash commits into 0909d32444025d3da537752b2e3dfc02c6de384f
│ args: jj squash
│
│ Changed commits:
│ ○ + roxxplny a97d04be (empty) (no description set)
│ ○ + lrzyoxlw cbbb16fe (empty) working copy
│ - lrzyoxlw hidden 0909d324 (conflict) working copy
│ - orvmmlsz hidden 04d3455f (no description set)
│
│ Changed working copy default@:
│ + roxxplny a97d04be (empty) (no description set)
│ - orvmmlsz hidden 04d3455f (no description set)
○ 6d66023ac8b6 [email protected] 11 hours ago, lasted 81 milliseconds
│ snapshot working copy
│ args: jj status
│
│ Changed commits:
│ ○ + orvmmlsz 04d3455f (no description set)
│ - orvmmlsz hidden f8478cd4 (conflict) (empty) (no description set)
│ Resolved conflict in flake.nix:
│ ...
│ 183 183: enable = true;
│ 184 184: };
│ 185 185:
│ 186 : <<<<<<< Conflict 1 of 1
│ 187 : +++++++ Contents of side #1
│ 188 186: # Format Markdown code consistently.
│ 189 187: mdformat = {
│ 190 188: enable = true;
│ 191 189: };
│ 192 190:
│ 193 191: # Format Nix code consistently.
│ 194 : %%%%%%% Changes from base #1 to side #2
│ 195 : # Format `markdown` code consistently.
│ 196 : mdformat = {
│ 197 : enable = true;
│ 198 : };
│ 199 :
│ 200 : # Format `nix` code consistently.
│ 201 : %%%%%%% Changes from base #2 to side #3
│ 202 : # Format `markdown` code consistently.
│ 203 : mdformat = {
│ 204 : enable = true;
│ 205 : };
│ 206 :
│ 207 : # Format `nix` code consistently.
│ 208 : %%%%%%% Changes from base #3 to side #4
│ 209 : - # Format Markdown code consistently.
│ 210 : + # Format `markdown` code consistently.
│ 211 : mdformat = {
│ 212 : enable = true;
│ 213 : };
│ 214 :
│ 215 : # Format `nix` code consistently.
│ 216 : +++++++ Contents of side #5
│ 217 : # Format `nix` code consistently.
│ 218 : %%%%%%% Changes from base #4 to side #6
│ 219 : - # Format `markdown` code consistently.
│ 220 : + # Format Markdown code consistently.
│ 221 : mdformat = {
│ 222 : enable = true;
│ 223 : };
│ 224 :
│ 225 : # Format Nix code consistently.
│ 226 : ------- Contents of base #5
│ 227 : # Format `nix` code consistently.
│ 228 : >>>>>>> Conflict 1 of 1 ends
│ 229 192: nixfmt = {
│ 230 193: enable = true;
│ 231 194: };
│ ...
│
│ Changed working copy default@:
│ + orvmmlsz 04d3455f (no description set)
│ - orvmmlsz hidden f8478cd4 (conflict) (empty) (no description set)
○ 48e9ca86b511 [email protected] 11 hours ago, lasted 93 milliseconds
│ new empty commit
│ args: jj new lrz
│
│ Changed commits:
│ ○ + orvmmlsz f8478cd4 (conflict) (empty) (no description set)
│ ○ - zzynqpuz hidden 48a87553 (empty) (no description set)
│
│ Changed working copy default@:
│ + orvmmlsz f8478cd4 (conflict) (empty) (no description set)
│ - zzynqpuz hidden 48a87553 (empty) (no description set)
○ da1e389c3538 [email protected] 11 hours ago, lasted 566 milliseconds
│ squash commits into cbdec43c7cdaad4598107ec04050200e07a1bfed
│ args: jj squash
│
│ Changed commits:
│ ○ + zzynqpuz 48a87553 (empty) (no description set)
│ │ ○ + lrzyoxlw 0909d324 (conflict) working copy
│ │ │ - lrzyoxlw hidden 54da852b (conflict) working copy
│ │ ○ + vqlkoqxl 0dbb06eb (empty) joneshf/trunk
│ │ │ - vqlkoqxl hidden 5c5b7e46 (conflict) (empty) joneshf/trunk
│ │ │ ○ + vwxtwqlk e68d6e37 [REBASE] Update dependencies requires `purescript` 0.15.0 or newer
│ │ ├─╯ - vwxtwqlk hidden 5c6b5a9f (conflict) [REBASE] Update dependencies requires `purescript` 0.15.0 or newer
│ │ ○ + llpsqqtv a5c08b6d Update comments to mention `Type.Proxy.Proxy`
│ │ │ - llpsqqtv hidden a6280bef (conflict) Update comments to mention `Type.Proxy.Proxy`
│ │ ○ + mutnyrqv 55a2ef22 Use a poly-kinded `Proxy`
│ │ │ - mutnyrqv hidden 5b4fb5d2 (conflict) Use a poly-kinded `Proxy`
│ │ ○ + lvpmxxtt a8110255 (empty) Update GitHub Actions
│ ├─╯ - lvpmxxtt hidden 3877a520 (conflict) (empty) Update GitHub Actions
│ ○ + qyyvsqxl 715c2c1f Enable `actionlint`
│ - qyyvsqxl hidden cbdec43c (conflict) Enable `actionlint`
│ - ukptqyvr hidden 8472bdec (no description set)
│
│ Changed working copy default@:
│ + zzynqpuz 48a87553 (empty) (no description set)
│ - ukptqyvr hidden 8472bdec (no description set)
○ c48f676b1de7 [email protected] 11 hours ago, lasted 77 milliseconds
│ snapshot working copy
│ args: jj status
│
│ Changed commits:
│ ○ + ukptqyvr 8472bdec (no description set)
│ - ukptqyvr hidden f137da6e (conflict) (empty) (no description set)
│ Resolved conflict in flake.nix:
│ ...
│ 116 116: ];
│ 117 117:
│ 118 118: hooks = {
│ 119 : <<<<<<< Conflict 1 of 1
│ 120 : %%%%%%% Changes from base to side #1
│ 121 : - # Check `nix` code for anything that is unused.
│ 122 : + # Check Nix code for anything that is unused.
│ 123 : +++++++ Contents of side #2
│ 124 119: # Check `.github/workflows` code.
│ 125 120: actionlint = {
│ 126 121: enable = true;
│ 127 122: };
│ 128 123:
│ 129 124: # Check `nix`Nix code for anything that is unused.
│ 130 : >>>>>>> Conflict 1 of 1 ends
│ 131 125: deadnix = {
│ 132 126: enable = true;
│ 133 127: };
│ ...
│
│ Changed working copy default@:
│ + ukptqyvr 8472bdec (no description set)
│ - ukptqyvr hidden f137da6e (conflict) (empty) (no description set)
○ 94bf0e721416 [email protected] 11 hours ago, lasted 90 milliseconds
│ new empty commit
│ args: jj new qy
│
│ Changed commits:
│ ○ + ukptqyvr f137da6e (conflict) (empty) (no description set)
│ ○ - uoywqxtw hidden c01f2031 (empty) (no description set)
│
│ Changed working copy default@:
│ + ukptqyvr f137da6e (conflict) (empty) (no description set)
│ - uoywqxtw hidden c01f2031 (empty) (no description set)
○ ec6bd839e226 [email protected] 11 hours ago, lasted 763 milliseconds
│ squash commits into c3c5478c9c041aaa13e81a51bc950bc05ba656d8
│ args: jj squash
│
│ Changed commits:
│ ○ + uoywqxtw c01f2031 (empty) (no description set)
│ │ ○ + lrzyoxlw 54da852b (conflict) working copy
│ │ │ - lrzyoxlw hidden 4c7997ca (conflict) working copy
│ │ ○ + vqlkoqxl 5c5b7e46 (conflict) (empty) joneshf/trunk
│ │ │ - vqlkoqxl hidden 76c0002f (conflict) joneshf/trunk
│ │ │ ○ + vwxtwqlk 5c6b5a9f (conflict) [REBASE] Update dependencies requires `purescript` 0.15.0 or newer
│ │ ├─╯ - vwxtwqlk hidden c17467ff (conflict) [REBASE] Update dependencies requires `purescript` 0.15.0 or newer
│ │ ○ + llpsqqtv a6280bef (conflict) Update comments to mention `Type.Proxy.Proxy`
│ │ │ - llpsqqtv hidden a9ab49f3 (conflict) Update comments to mention `Type.Proxy.Proxy`
│ │ ○ + mutnyrqv 5b4fb5d2 (conflict) Use a poly-kinded `Proxy`
│ │ │ - mutnyrqv hidden 73567a4d (conflict) Use a poly-kinded `Proxy`
│ │ ○ + lvpmxxtt 3877a520 (conflict) (empty) Update GitHub Actions
│ │ │ - lvpmxxtt hidden 5324b028 (conflict) Update GitHub Actions
│ │ ○ + qyyvsqxl cbdec43c (conflict) Enable `actionlint`
│ │ │ - qyyvsqxl hidden 63fb7fae (conflict) Enable `actionlint`
│ │ ○ + kmxpypum b55825a7 Enable `yamlfmt`
│ │ │ - kmxpypum hidden 94be8211 (conflict) Enable `yamlfmt`
│ │ ○ + sqpszmlz ab1e3df6 Migrate to `purs-tidy`
│ ├─╯ - sqpszmlz hidden 3cdbcf42 (conflict) Migrate to `purs-tidy`
│ ○ + lrnzsvpz f907a298 Enable `mdformat`
│ - lrnzsvpz hidden c3c5478c (conflict) Enable `mdformat`
│ - pmuoqukl hidden cc5f1165 (no description set)
│
│ Changed working copy default@:
│ + uoywqxtw c01f2031 (empty) (no description set)
│ - pmuoqukl hidden cc5f1165 (no description set)
○ fbb58ad723ba [email protected] 11 hours ago, lasted 72 milliseconds
│ snapshot working copy
│ args: jj status
│
│ Changed commits:
│ ○ + pmuoqukl cc5f1165 (no description set)
│ - pmuoqukl hidden f2cd2171 (conflict) (empty) (no description set)
│ Resolved conflict in flake.nix:
│ ...
│ 178 178: enable = true;
│ 179 179: };
│ 180 180:
│ 181 : <<<<<<< Conflict 1 of 1
│ 182 : %%%%%%% Changes from base #1 to side #1
│ 183 : - # Format `nix` code consistently.
│ 184 : + # Format Nix code consistently.
│ 185 : %%%%%%% Changes from base #2 to side #2
│ 186 : # Format `markdown` code consistently.
│ 187 : mdformat = {
│ 188 : enable = true;
│ 189 : };
│ 190 :
│ 191 : # Format `nix` code consistently.
│ 192 : +++++++ Contents of side #3
│ 193 181: # Format Markdown code consistently.
│ 194 182: mdformat = {
│ 195 183: enable = true;
│ 196 184: };
│ 197 185:
│ 198 186: # Format `nix`Nix code consistently.
│ 199 : >>>>>>> Conflict 1 of 1 ends
│ 200 187: nixfmt = {
│ 201 188: enable = true;
│ 202 189: };
│ ...
│
│ Changed working copy default@:
│ + pmuoqukl cc5f1165 (no description set)
│ - pmuoqukl hidden f2cd2171 (conflict) (empty) (no description set)
○ b0de9334956d [email protected] 11 hours ago, lasted 93 milliseconds
│ new empty commit
│ args: jj new lrn
│
│ Changed commits:
│ ○ + pmuoqukl f2cd2171 (conflict) (empty) (no description set)
│ ○ - ynmrwkww hidden fe78fbe6 (empty) (no description set)
│
│ Changed working copy default@:
│ + pmuoqukl f2cd2171 (conflict) (empty) (no description set)
│ - ynmrwkww hidden fe78fbe6 (empty) (no description set)
○ 01b6ad42f94f [email protected] 11 hours ago, lasted 965 milliseconds
│ squash commits into b7117a964f9769ec60d631f7865830002e5c5651
│ args: jj squash
│
│ Changed commits:
│ ○ + ynmrwkww fe78fbe6 (empty) (no description set)
│ │ ○ + lrzyoxlw 4c7997ca (conflict) working copy
│ │ │ - lrzyoxlw hidden 8051699f working copy
│ │ ○ + vqlkoqxl 76c0002f (conflict) joneshf/trunk
│ │ │ - vqlkoqxl hidden 778d7f28 (conflict) joneshf/trunk
│ │ │ ○ + vwxtwqlk c17467ff (conflict) [REBASE] Update dependencies requires `purescript` 0.15.0 or newer
│ │ ├─╯ - vwxtwqlk hidden 2c8f537e (conflict) [REBASE] Update dependencies requires `purescript` 0.15.0 or newer
│ │ ○ + llpsqqtv a9ab49f3 (conflict) Update comments to mention `Type.Proxy.Proxy`
│ │ │ - llpsqqtv hidden 2d9078de (conflict) Update comments to mention `Type.Proxy.Proxy`
│ │ ○ + mutnyrqv 73567a4d (conflict) Use a poly-kinded `Proxy`
│ │ │ - mutnyrqv hidden 373cd9b8 (conflict) Use a poly-kinded `Proxy`
│ │ ○ + lvpmxxtt 5324b028 (conflict) Update GitHub Actions
│ │ │ - lvpmxxtt hidden fea67403 (conflict) Update GitHub Actions
│ │ ○ + qyyvsqxl 63fb7fae (conflict) Enable `actionlint`
│ │ │ - qyyvsqxl hidden 6df10a45 (conflict) Enable `actionlint`
│ │ ○ + kmxpypum 94be8211 (conflict) Enable `yamlfmt`
│ │ │ - kmxpypum hidden 03a23473 (conflict) Enable `yamlfmt`
│ │ ○ + sqpszmlz 3cdbcf42 (conflict) Migrate to `purs-tidy`
│ │ │ - sqpszmlz hidden 942986e5 (conflict) Migrate to `purs-tidy`
│ │ ○ + lrnzsvpz c3c5478c (conflict) Enable `mdformat`
│ │ │ - lrnzsvpz hidden e0e091ed (conflict) Enable `mdformat`
│ │ ○ + zvsynrwu e26ff853 Enable `markdownlint`
│ │ │ - zvsynrwu hidden 73e8d5fc (conflict) Enable `markdownlint`
│ │ ○ + mymxztky 72c69fe9 Enable `typos` linter
│ ├─╯ - mymxztky hidden fbfcf8cc (conflict) Enable `typos` linter
│ ○ + qntqrsrq bf49613a Check lints and formatting with `nix`
│ - qntqrsrq hidden b7117a96 (conflict) Check lints and formatting with `nix`
│ - vlvmkkxs hidden f0840c76 (no description set)
│
│ Changed working copy default@:
│ + ynmrwkww fe78fbe6 (empty) (no description set)
│ - vlvmkkxs hidden f0840c76 (no description set)
○ d43ebbbe3eac [email protected] 11 hours ago, lasted 71 milliseconds
│ snapshot working copy
│ args: jj status
│
│ Changed commits:
│ ○ + vlvmkkxs f0840c76 (no description set)
│ - vlvmkkxs hidden 60951b92 (conflict) (empty) (no description set)
│ Resolved conflict in flake.nix:
│ ...
│ 116 116: ];
│ 117 117:
│ 118 118: hooks = {
│ 119 : <<<<<<< Conflict 1 of 2
│ 120 : +++++++ Contents of side #1
│ 121 : # Check `nix` code for anything that is unused.
│ 122 : %%%%%%% Changes from base to side #2
│ 123 : # Check `.github/workflows` code.
│ 124 : actionlint = {
│ 125 : enable = true;
│ 126 : };
│ 127 :
│ 128 : - # Check `nix` code for anything that is unused.
│ 129 119: + # Check Nix code for anything that is unused.
│ 130 : >>>>>>> Conflict 1 of 2 ends
│ 131 120: deadnix = {
│ 132 121: enable = true;
│ 133 122: };
│ ...
│ 163 152: enable = true;
│ 164 153: };
│ 165 154:
│ 166 : <<<<<<< Conflict 2 of 2
│ 167 : +++++++ Contents of side #1
│ 168 : # Format `nix` code consistently.
│ 169 : %%%%%%% Changes from base to side #2
│ 170 : # Format `markdown` code consistently.
│ 171 : mdformat = {
│ 172 : enable = true;
│ 173 : };
│ 174 :
│ 175 : - # Format `nix` code consistently.
│ 176 155: + # Format Nix code consistently.
│ 177 : >>>>>>> Conflict 2 of 2 ends
│ 178 156: nixfmt = {
│ 179 157: enable = true;
│ 180 158: };
│ ...
│
│ Changed working copy default@:
│ + vlvmkkxs f0840c76 (no description set)
│ - vlvmkkxs hidden 60951b92 (conflict) (empty) (no description set)
○ cc68e80f5446 [email protected] 11 hours ago, lasted 93 milliseconds
│ new empty commit
│ args: jj new qn
│
│ Changed commits:
│ ○ + vlvmkkxs 60951b92 (conflict) (empty) (no description set)
│
│ Changed working copy default@:
│ + vlvmkkxs 60951b92 (conflict) (empty) (no description set)
│ - lrzyoxlw 8051699f working copy
○ aa35c98f1988 [email protected] 11 hours ago, lasted 1 second
│ absorb changes into 5 commits
│ args: jj absorb
│
│ Changed commits:
│ ○ + lrzyoxlw 8051699f working copy
│ │ - lrzyoxlw hidden b976da19 working copy
│ │ Resolved conflict in flake.nix:
│ │ ...
│ │ 183 183: enable = true;
│ │ 184 184: };
│ │ 185 185:
│ │ 186 : <<<<<<< Conflict 1 of 1
│ │ 187 : %%%%%%% Changes from base #1 to side #1
│ │ 188 : # Format `nix` code consistently.
│ │ 189 : +++++++ Contents of side #2
│ │ 190 186: # Format `markdown` # Format Markdown code consistently.
│ │ 191 187: mdformat = {
│ │ 192 188: enable = true;
│ │ 193 189: };
│ │ 194 190:
│ │ 195 191: # Format Nix code consistently.
│ │ 196 : %%%%%%% Changes from base #2 to side #3
│ │ 197 : # Format `markdown` code consistently.
│ │ 198 : mdformat = {
│ │ 199 : enable = true;
│ │ 200 : };
│ │ 201 :
│ │ 202 : # Format `nix` code consistently.
│ │ 203 : %%%%%%% Changes from base #3 to side #4
│ │ 204 : # Format `markdown` code consistently.
│ │ 205 : mdformat = {
│ │ 206 : enable = true;
│ │ 207 : };
│ │ 208 :
│ │ 209 : # Format `nix` code consistently.
│ │ 210 : %%%%%%% Changes from base #4 to side #5
│ │ 211 : - # Format `markdown` code consistently.
│ │ 212 : + # Format Markdown code consistently.
│ │ 213 : mdformat = {
│ │ 214 : enable = true;
│ │ 215 : };
│ │ 216 :
│ │ 217 : # Format `nix` code consistently.
│ │ 218 : %%%%%%% Changes from base #5 to side #6
│ │ 219 : - # Format `markdown` code consistently.
│ │ 220 : + # Format Markdown code consistently.
│ │ 221 : mdformat = {
│ │ 222 : enable = true;
│ │ 223 : };
│ │ 224 :
│ │ 225 : - # Format `nix` code consistently.
│ │ 226 : + # Format Nix code consistently.
│ │ 227 : >>>>>>> Conflict 1 of 1 ends
│ │ 228 192: nixfmt = {
│ │ 229 193: enable = true;
│ │ 230 194: };
│ │ ...
│ ○ + vqlkoqxl 778d7f28 (conflict) joneshf/trunk
│ │ - vqlkoqxl hidden 4ab93210 (empty) joneshf/trunk
│ │ ○ + vwxtwqlk 2c8f537e (conflict) [REBASE] Update dependencies requires `purescript` 0.15.0 or newer
│ ├─╯ - vwxtwqlk hidden 86596f98 [REBASE] Update dependencies requires `purescript` 0.15.0 or newer
│ ○ + llpsqqtv 2d9078de (conflict) Update comments to mention `Type.Proxy.Proxy`
│ │ - llpsqqtv hidden cbef4388 Update comments to mention `Type.Proxy.Proxy`
│ ○ + mutnyrqv 373cd9b8 (conflict) Use a poly-kinded `Proxy`
│ │ - mutnyrqv hidden 17455374 Use a poly-kinded `Proxy`
│ ○ + lvpmxxtt fea67403 (conflict) Update GitHub Actions
│ │ - lvpmxxtt hidden 29f95674 (empty) Update GitHub Actions
│ ○ + qyyvsqxl 6df10a45 (conflict) Enable `actionlint`
│ │ - qyyvsqxl hidden ccc566ba Enable `actionlint`
│ ○ + kmxpypum 03a23473 (conflict) Enable `yamlfmt`
│ │ - kmxpypum hidden 1a9fb9a6 Enable `yamlfmt`
│ │ - lrzyoxlw hidden b976da19 working copy
│ │ Modified conflict in flake.nix:
│ │ ...
│ │ 149 149: enable = true;
│ │ 150 150: };
│ │ 151 151:
│ │ 152 152: - # Check `nix` code for anything that is unused.
│ │ 153 : + # Check Nix code for anything that is unused.
│ │ 154 153: >>>>>>> Conflict 1 of 2 ends
│ │ 155 154: deadnix = {
│ │ 156 155: enable = true;
│ │ ...
│ │ 246 245:
│ │ 247 246: # Format `nix` code consistently.
│ │ 248 247: %%%%%%% Changes from base #4 to side #6
│ │ 249 248: - # Format `markdown` code consistently.
│ │ 250 : + # Format Markdown code consistently.
│ │ 251 249: mdformat = {
│ │ 252 250: enable = true;
│ │ 253 251: };
│ │ 254 252:
│ │ 255 253: - # Format `nix` code consistently.
│ │ 256 : + # Format Nix code consistently.
│ │ 257 254: ------- Contents of base #5
│ │ 258 255: # Format `markdown` code consistently.
│ │ 259 256: mdformat = {
│ │ ...
│ ○ + sqpszmlz 942986e5 (conflict) Migrate to `purs-tidy`
│ │ - sqpszmlz hidden c1ec3554 Migrate to `purs-tidy`
│ │ - lrzyoxlw hidden b976da19 working copy
│ │ Modified conflict in flake.nix:
│ │ ...
│ │ 116 116: ];
│ │ 117 117:
│ │ 118 118: hooks = {
│ │ 119 119: <<<<<<< Conflict 1 of 32
│ │ 120 120: +++++++ Contents of side #1
│ │ 121 121: # Check `nix` code for anything that is unused.
│ │ 122 122: %%%%%%% Changes from base #1 to side #2
│ │ ...
│ │ 142 142: enable = true;
│ │ 143 143: };
│ │ 144 144:
│ │ 145 145: - # Check `nix` code for anything that is unused.
│ │ 146 : + # Check Nix code for anything that is unused.
│ │ 147 146: >>>>>>> Conflict 1 of 32 ends
│ │ 148 147: deadnix = {
│ │ 149 148: enable = true;
│ │ 150 149: };
│ │ ...
│ │ 206 205: enable = true;
│ │ 207 206: };
│ │ 208 207:
│ │ 209 208: <<<<<<< Conflict 2 of 32
│ │ 210 209: +++++++ Contents of side #1
│ │ 211 210: # Format `nix` code consistently.
│ │ 212 211: %%%%%%% Changes from base #1 to side #2
│ │ ...
│ │ 232 231: +
│ │ 233 232: # Format `nix` code consistently.
│ │ 234 233: %%%%%%% Changes from base #3 to side #5
│ │ 235 234: - # Format `markdown` code consistently.
│ │ 236 : + # Format Markdown code consistently.
│ │ 237 235: mdformat = {
│ │ 238 236: enable = true;
│ │ 239 237: };
│ │ 240 238:
│ │ 241 239: - # Format `nix` code consistently.
│ │ 242 : + # Format Nix code consistently.
│ │ 243 240: ------- Contents of base #4
│ │ 244 241: # Format `markdown` code consistently.
│ │ 245 242: mdformat = {
│ │ 246 243: enable = true;
│ │ 247 244: };
│ │ 248 245:
│ │ 249 246: # Format `nix` code consistently.
│ │ 250 247: >>>>>>> Conflict 2 of 32 ends
│ │ 251 248: nixfmt = {
│ │ 252 249: enable = true;
│ │ 253 250: };
│ │ ...
│ │ 263 260: shfmt = {
│ │ 264 261: enable = true;
│ │ 265 262: };
│ │ 266 : <<<<<<< Conflict 3 of 3
│ │ 267 : +++++++ Contents of side #1
│ │ 268 : %%%%%%% Changes from base #1 to side #2
│ │ 269 :
│ │ 270 : # Format `YAML` code consistently.
│ │ 271 : yamlfmt = {
│ │ 272 : enable = true;
│ │ 273 : };
│ │ 274 : %%%%%%% Changes from base #2 to side #3
│ │ 275 : %%%%%%% Changes from base #3 to side #4
│ │ 276 :
│ │ 277 : # Format `YAML` code consistently.
│ │ 278 : yamlfmt = {
│ │ 279 : enable = true;
│ │ 280 : };
│ │ 281 : %%%%%%% Changes from base #4 to side #5
│ │ 282 :
│ │ 283 : - # Format `YAML` code consistently.
│ │ 284 : + # Format YAML code consistently.
│ │ 285 : yamlfmt = {
│ │ 286 : enable = true;
│ │ 287 : };
│ │ 288 : >>>>>>> Conflict 3 of 3 ends
│ │ 289 263: };
│ │ 290 264:
│ │ 291 265: settings.global.excludes = [
│ │ ...
│ ○ + lrnzsvpz e0e091ed (conflict) Enable `mdformat`
│ │ - lrnzsvpz hidden bcb136b5 Enable `mdformat`
│ │ - lrzyoxlw hidden b976da19 working copy
│ │ Modified conflict in flake.nix:
│ │ ...
│ │ 116 116: ];
│ │ 117 117:
│ │ 118 118: hooks = {
│ │ 119 119: <<<<<<< Conflict 1 of 42
│ │ 120 120: +++++++ Contents of side #1
│ │ 121 121: # Check `nix` code for anything that is unused.
│ │ 122 122: %%%%%%% Changes from base #1 to side #2
│ │ ...
│ │ 135 135: enable = true;
│ │ 136 136: };
│ │ 137 137:
│ │ 138 138: - # Check `nix` code for anything that is unused.
│ │ 139 : + # Check Nix code for anything that is unused.
│ │ 140 139: >>>>>>> Conflict 1 of 42 ends
│ │ 141 140: deadnix = {
│ │ 142 141: enable = true;
│ │ 143 142: };
│ │ ...
│ │ 199 198: enable = true;
│ │ 200 199: };
│ │ 201 200:
│ │ 202 201: <<<<<<< Conflict 2 of 42
│ │ 203 202: +++++++ Contents of side #1
│ │ 204 203: # Format `nix` code consistently.
│ │ 205 204: %%%%%%% Changes from base #1 to side #2
│ │ ...
│ │ 210 209:
│ │ 211 210: - # Format `nix` code consistently.
│ │ 212 211: + # Format Nix code consistently.
│ │ 212: +++++++ Contents of side #3
│ │ 213: # Format `markdown` code consistently.
│ │ 214: mdformat = {
│ │ 215: enable = true;
│ │ 216: };
│ │ 217:
│ │ 218: # Format `nix` code consistently.
│ │ 213 219: %%%%%%% Changes from base #2 to side #34
│ │ 214 220: + # Format `markdown`Markdown code consistently.
│ │ 215 221: + mdformat = {
│ │ 216 222: + enable = true;
│ │ 217 223: + };
│ │ 218 224: +
│ │ 219 225: # Format `nix` code consistently.
│ │ 220 : %%%%%%% Changes from base #3 to side #4
│ │ 221 : - # Format `markdown` code consistently.
│ │ 222 : + # Format Markdown code consistently.
│ │ 223 : mdformat = {
│ │ 224 : enable = true;
│ │ 225 : };
│ │ 226 :
│ │ 227 : - # Format `nix` code consistently.
│ │ 228 : + # Format Nix code consistently.
│ │ 229 : >>>>>>> Conflict 2 of 4 ends
│ │ 226: ------- Contents of base #3
│ │ 227: # Format `markdown` code consistently.
│ │ 228: mdformat = {
│ │ 229: enable = true;
│ │ 230: };
│ │ 231:
│ │ 232: # Format `nix` code consistently.
│ │ 233: >>>>>>> Conflict 2 of 2 ends
│ │ 230 234: nixfmt = {
│ │ 231 235: enable = true;
│ │ 232 236: };
│ │ 233 237:
│ │ 234 : <<<<<<< Conflict 3 of 4
│ │ 235 : +++++++ Contents of side #1
│ │ 236 : %%%%%%% Changes from base #1 to side #2
│ │ 237 : # Format `purescript` code consistently.
│ │ 238 : purs-tidy = {
│ │ 239 : enable = true;
│ │ 240 :
│ │ 241 : includes = [ "*.purs" ];
│ │ 242 : };
│ │ 243 :
│ │ 244 : %%%%%%% Changes from base #2 to side #3
│ │ 245 : %%%%%%% Changes from base #3 to side #4
│ │ 246 : - # Format `purescript` code consistently.
│ │ 247 : + # Format PureScript code consistently.
│ │ 248 : purs-tidy = {
│ │ 249 : enable = true;
│ │ 250 :
│ │ 251 : includes = [ "*.purs" ];
│ │ 252 : };
│ │ 253 :
│ │ 254 : >>>>>>> Conflict 3 of 4 ends
│ │ 255 238: # Format Shell code consistently.
│ │ 256 239: shfmt = {
│ │ 257 240: enable = true;
│ │ 258 241: };
│ │ 259 : <<<<<<< Conflict 4 of 4
│ │ 260 : +++++++ Contents of side #1
│ │ 261 : %%%%%%% Changes from base #1 to side #2
│ │ 262 :
│ │ 263 : # Format `YAML` code consistently.
│ │ 264 : yamlfmt = {
│ │ 265 : enable = true;
│ │ 266 : };
│ │ 267 : %%%%%%% Changes from base #2 to side #3
│ │ 268 : %%%%%%% Changes from base #3 to side #4
│ │ 269 :
│ │ 270 : - # Format `YAML` code consistently.
│ │ 271 : + # Format YAML code consistently.
│ │ 272 : yamlfmt = {
│ │ 273 : enable = true;
│ │ 274 : };
│ │ 275 : >>>>>>> Conflict 4 of 4 ends
│ │ 276 242: };
│ │ 277 243:
│ │ 278 244: settings.global.excludes = [
│ │ ...
│ ○ + zvsynrwu 73e8d5fc (conflict) Enable `markdownlint`
│ │ - zvsynrwu hidden ee7ad985 Enable `markdownlint`
│ ○ + mymxztky fbfcf8cc (conflict) Enable `typos` linter
│ │ - mymxztky hidden 8648a806 Enable `typos` linter
│ ○ + qntqrsrq b7117a96 (conflict) Check lints and formatting with `nix`
│ │ - qntqrsrq hidden 99020bbb Check lints and formatting with `nix`
│ │ - lrzyoxlw hidden b976da19 working copy
│ │ Modified conflict in flake.nix:
│ │ ...
│ │ 116 116: ];
│ │ 117 117:
│ │ 118 118: hooks = {
│ │ 119 119: <<<<<<< Conflict 1 of 42
│ │ 120 120: +++++++ Contents of side #1
│ │ 121 121: # Check `nix` code for anything that is unused.
│ │ 122 122: %%%%%%% Changes from base to side #2
│ │ ...
│ │ 127 127:
│ │ 128 128: - # Check `nix` code for anything that is unused.
│ │ 129 129: + # Check Nix code for anything that is unused.
│ │ 130 130: >>>>>>> Conflict 1 of 42 ends
│ │ 131 131: deadnix = {
│ │ 132 132: enable = true;
│ │ 133 133: };
│ │ ...
│ │ 163 163: enable = true;
│ │ 164 164: };
│ │ 165 165:
│ │ 166 166: <<<<<<< Conflict 2 of 42
│ │ 167: +++++++ Contents of side #1
│ │ 168: # Format `nix` code consistently.
│ │ 167 169: %%%%%%% Changes from base to side #12
│ │ 168 170: - # Format `markdown` code consistently.
│ │ 169 171: - mdformat = {
│ │ 170 172: - enable = true;
│ │ 171 173: - };
│ │ 174:
│ │ 172 175: -
│ │ 173 175: # Format `nix` code consistently.
│ │ 174 176: +++++++ Contents of side #2
│ │ 175 : # Format Markdown code consistently.
│ │ 176 : mdformat = {
│ │ 177 : enable = true;
│ │ 178 : };
│ │ 179 :
│ │ 180 176: # Format Nix code consistently.
│ │ 181 177: >>>>>>> Conflict 2 of 42 ends
│ │ 182 178: nixfmt = {
│ │ 183 179: enable = true;
│ │ 184 180: };
│ │ 185 181:
│ │ 186 : <<<<<<< Conflict 3 of 4
│ │ 187 : +++++++ Contents of side #1
│ │ 188 : %%%%%%% Changes from base to side #2
│ │ 189 : - # Format `purescript` code consistently.
│ │ 190 : + # Format PureScript code consistently.
│ │ 191 : purs-tidy = {
│ │ 192 : enable = true;
│ │ 193 :
│ │ 194 : includes = [ "*.purs" ];
│ │ 195 : };
│ │ 196 :
│ │ 197 : >>>>>>> Conflict 3 of 4 ends
│ │ 198 182: # Format Shell code consistently.
│ │ 199 183: shfmt = {
│ │ 200 184: enable = true;
│ │ 201 185: };
│ │ 202 : <<<<<<< Conflict 4 of 4
│ │ 203 : +++++++ Contents of side #1
│ │ 204 : %%%%%%% Changes from base to side #2
│ │ 205 :
│ │ 206 : - # Format `YAML` code consistently.
│ │ 207 : + # Format YAML code consistently.
│ │ 208 : yamlfmt = {
│ │ 209 : enable = true;
│ │ 210 : };
│ │ 211 : >>>>>>> Conflict 4 of 4 ends
│ │ 212 186: };
│ │ 213 187:
│ │ 214 188: settings.global.excludes = [
│ │ ...
│ ○ + svlrmlsq bfe20f6e Fix compiler warnings
│ │ - svlrmlsq hidden d0991639 Fix compiler warnings
│ ○ + lzvlzwup 23fa88f5 Support ARM platforms in `nix`
│ - lzvlzwup hidden 025cb16b Support ARM platforms in `nix`
│ - lrzyoxlw hidden b976da19 working copy
│ Resolved conflict in flake.nix:
│ ...
│ 56 56: ];
│ 57 57: };
│ 58 58: };
│ 59 : <<<<<<< Conflict 1 of 1
│ 60 : +++++++ Contents of side #1
│ 61 : %%%%%%% Changes from base to side #2
│ 62 :
│ 63 : pre-commit = {
│ 64 : settings = {
│ 65 : default_stages = [
│ 66 : "pre-commit"
│ 67 : "pre-push"
│ 68 : ];
│ 69 :
│ 70 : hooks = {
│ 71 : # Check `.github/workflows` code.
│ 72 : actionlint = {
│ 73 : enable = true;
│ 74 : };
│ 75 :
│ 76 : - # Check `nix` code for anything that is unused.
│ 77 : + # Check Nix code for anything that is unused.
│ 78 : deadnix = {
│ 79 : enable = true;
│ 80 : };
│ 81 :
│ 82 : # Check that we're not accidentally committing AWS credentials.
│ 83 : detect-aws-credentials = {
│ 84 : enable = true;
│ 85 : };
│ 86 :
│ 87 : # Check that we're not accidentally committing private keys
│ 88 : detect-private-keys = {
│ 89 : enable = true;
│ 90 : };
│ 91 :
│ 92 : - # `git` `submodule`s are nothing but a can of worms that fails in some non-obvious way each time they're used.
│ 93 : + # Git submodules are nothing but a can of worms that fails in some non-obvious way each time they're used.
│ 94 : forbid-new-submodules = {
│ 95 : enable = true;
│ 96 : };
│ 97 :
│ 98 : # Check markdown files for consistency.
│ 99 : markdownlint = {
│ 100 : enable = true;
│ 101 :
│ 102 : settings = {
│ 103 : configuration = {
│ 104 : MD013 = {
│ 105 : # We'd like to use something like `wrap:inner-sentence`:
│ 106 : # https://cirosantilli.com/markdown-style-guide/#option-wrap-inner-sentence,
│ 107 : # or something related to SemBr: https://sembr.org/.
│ 108 : # But that's stymied in an issue: https://github.com/DavidAnson/markdownlint/issues/298.
│ 109 : #
│ 110 : # We set the line length to something large enough to not get hit by it regularly.
│ 111 : line_length = 1000;
│ 112 : };
│ 113 : };
│ 114 : };
│ 115 : };
│ 116 :
│ 117 : # While `nil` is a language server,
│ 118 : # it also has come static analysis we want to check.
│ 119 : nil = {
│ 120 : enable = true;
│ 121 : };
│ 122 :
│ 123 : # Check that we're not making any simple typos in prose.
│ 124 : # This checks not just plain text files (like Markdown),
│ 125 : # but also comments in source code like this comment you're reading right now.
│ 126 : typos = {
│ 127 : enable = true;
│ 128 : };
│ 129 : };
│ 130 : };
│ 131 : };
│ 132 :
│ 133 : treefmt = {
│ 134 : programs = {
│ 135 : - # Format `JSON` code consistently.
│ 136 : + # Format JSON code consistently.
│ 137 : jsonfmt = {
│ 138 : enable = true;
│ 139 : };
│ 140 :
│ 141 : - # Format `markdown` code consistently.
│ 142 : + # Format Markdown code consistently.
│ 143 : mdformat = {
│ 144 : enable = true;
│ 145 : };
│ 146 :
│ 147 : - # Format `nix` code consistently.
│ 148 : + # Format Nix code consistently.
│ 149 : nixfmt = {
│ 150 : enable = true;
│ 151 : };
│ 152 :
│ 153 : - # Format `purescript` code consistently.
│ 154 : + # Format PureScript code consistently.
│ 155 : purs-tidy = {
│ 156 : enable = true;
│ 157 :
│ 158 : includes = [ "*.purs" ];
│ 159 : };
│ 160 :
│ 161 : # Format Shell code consistently.
│ 162 : shfmt = {
│ 163 : enable = true;
│ 164 : };
│ 165 :
│ 166 : - # Format `YAML` code consistently.
│ 167 : + # Format YAML code consistently.
│ 168 : yamlfmt = {
│ 169 : enable = true;
│ 170 : };
│ 171 : };
│ 172 :
│ 173 : settings.global.excludes = [
│ 174 : ".direnv/*"
│ 175 : ".jj/*"
│ 176 : "bower_components/*"
│ 177 : "node_modules/*"
│ 178 : "output/*"
│ 179 : ];
│ 180 : };
│ 181 : >>>>>>> Conflict 1 of 1 ends
│ 182 59: };
│ 183 60:
│ 184 61: systems = [
│ ...
│
│ Changed working copy default@:
│ + lrzyoxlw 8051699f working copy
│ - lrzyoxlw hidden b976da19 working copy
Created
July 13, 2025 15:28
-
-
Save joneshf/09d6f86e509901a972f9c7b7a725430f to your computer and use it in GitHub Desktop.
6-sided merge conflict from `jj`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment