WIP: Import resolution par JSON #30

Draft

ariasat wants to merge 3 commits from Import_JSON into main

pull from: Import_JSON

merge into: agecem:main

agecem:main

Conversation 0 Commits 3 Files changed 6 +101 -19

ariasat commented 2026-05-21 14:38:28 -04:00

Member

Copy link

closes #22

closes #22

ariasat added 3 commits 2026-05-21 14:38:28 -04:00

feature: ui route pour import json 6cf3292c1e

feature: nom json dans struct de resolution 7dd74e9c87

feature: ui pour import json a6eb36c051

All checks were successful

Hide all checks

/ test-build (pull_request) Successful in 34s

Details

This pull request has changes conflicting with the target branch.

• route.go

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title Merge pull request 'WIP: Import resolution par JSON' (#30) from Import_JSON into main

Merge commit body Reviewed-on: https://git.agecem.com/agecem/resolutions/pulls/30

Merge pull request 'WIP: Import resolution par JSON' (#30) from Import_JSON into main Reviewed-on: https://git.agecem.com/agecem/resolutions/pulls/30 Copy merge commit message

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin Import_JSON:Import_JSON

git switch Import_JSON

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main

git merge --no-ff Import_JSON

git switch Import_JSON

git rebase main

git switch main

git merge --ff-only Import_JSON

git switch Import_JSON

git rebase main

git switch main

git merge --no-ff Import_JSON

git switch main

git merge --squash Import_JSON

git switch main

git merge --ff-only Import_JSON

git switch main

git merge Import_JSON

git push origin main

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

agecem/resolutions!30

No description provided.