Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

a11y prs #16

Draft
wants to merge 17 commits into
base: main
Choose a base branch
from
Draft

a11y prs #16

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
6fa6421
a11y prs
bollwyvl Dec 3, 2023
6b8fd00
use a dangling lumino pr
bollwyvl Dec 3, 2023
713edf9
try theirs
bollwyvl Dec 3, 2023
6b6b866
Update jupyak_config.toml
tonyfast Dec 4, 2023
8a92d61
Update jupyak_config.toml
tonyfast Dec 4, 2023
9572c2d
Update jupyak_config.toml
tonyfast Dec 5, 2023
ef66aed
kick a build
tonyfast Dec 6, 2023
f7c92a9
Merge remote-tracking branch 'UPSTREAM/main' into a11y-prs
bollwyvl Dec 11, 2023
b8041b1
Merge remote-tracking branch 'origin/a11y-prs' into a11y-prs
bollwyvl Dec 11, 2023
5a5c758
Merge remote-tracking branch 'UPSTREAM/main' into a11y-prs
bollwyvl Dec 11, 2023
a105fd8
Merge remote-tracking branch 'UPSTREAM/main' into a11y-prs
bollwyvl Dec 11, 2023
1c6e49c
Merge remote-tracking branch 'UPSTREAM/main' into a11y-prs
bollwyvl Dec 12, 2023
1304459
Merge remote-tracking branch 'UPSTREAM/main' into a11y-prs
bollwyvl Dec 13, 2023
76a9964
yank gist
bollwyvl Dec 13, 2023
e88f2e6
Merge remote-tracking branch 'UPSTREAM/main' into a11y-prs
bollwyvl Dec 15, 2023
17cc228
Merge remote-tracking branch 'origin/a11y-prs' into a11y-prs
bollwyvl Dec 15, 2023
78a5e65
Update jupyak_config.toml
tonyfast Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions jupyak_config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
[lite]
gist = "7232671f04a5de8f1ce4b810f5ea8a3a"

[repos]
lumino.github.merge_with = [
"pull/655",
]
tonyfast marked this conversation as resolved.
Show resolved Hide resolved

jupyterlab.github.merge_strategy = "ort"
jupyterlab.github.merge_options = ["theirs"]
jupyterlab.github.merge_with = [
"pull/14575",
"pull/14597",
"pull/14766",
"pull/14854",
"pull/15222",
"pull/15347"
tonyfast marked this conversation as resolved.
Show resolved Hide resolved
]
tonyfast marked this conversation as resolved.
Show resolved Hide resolved
5 changes: 5 additions & 0 deletions src/jupyak/tasks/_git.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,11 @@
"\n",
" yield dict(\n",
" name=f\"{name}:checkout\",\n",
" uptodate=[\n",
" doit.tools.config_changed(\n",
" {\"s\": merge_strategy, \"x\": merge_options, \"refs\": local_refs}\n",
" )\n",
" ],\n",
" actions=actions,\n",
" file_dep=file_dep,\n",
" targets=targets,\n",
Expand Down