mirror of
https://github.com/penpot/penpot.git
synced 2026-10-29 14:00:37 +00:00
2a5a235063
This commit carries the design-branching preview by Juan de la Cruz: elhombretecla/penpot:branching at 0ac265a3f5, which holds 45 commits and 3 develop merges and was last synced with develop on 2026-09-16. The branch is squashed together with a merge of origin/develop at 7c039231f7, so the tree is the merged result. The merge resolved conflicts in six files: - backend/src/app/migrations.clj: develop's 0155 and 0156 steps run first, then the branching steps; the names differ. - backend/src/app/rpc/commands/viewer.clj: both requires stay. - common/src/app/common/flags.cljc: both flags stay. - frontend/src/app/main/ui/dashboard/file_menu.cljs: "Create branch" becomes a menu-item* with the same id, guard and handler. - frontend/src/app/main/ui/dashboard/grid.cljs: the portal goes with develop's menu rewrite; the branches popover stays in the trigger. - frontend/translations/en.po: both sides' entries stay, with develop's source references. Co-authored-by: Juan de la Cruz <delacruzgarciajuan@gmail.com> AI-assisted-by: mixed models
17 lines
294 B
JSON
17 lines
294 B
JSON
{
|
|
"~:changes": [],
|
|
"~:conflicts": [],
|
|
"~:stats": {
|
|
"~:added": 0,
|
|
"~:modified": 0,
|
|
"~:deleted": 0,
|
|
"~:conflicts": 0
|
|
},
|
|
"~:meta": {
|
|
"~:base-at": "~m1713536343369",
|
|
"~:main-at": "~m1713873823633",
|
|
"~:branch-at": "~m1713873823633",
|
|
"~:main-revn": 11
|
|
}
|
|
}
|