bottin/cms
3
0
Fork 0
Code Issues 16 Pull requests 5 Packages Activity

WIP: Export dans la caisse #170

Draft
dnova wants to merge 3 commits from export_caisse into main
pull from: export_caisse
merge into: bottin:main
Conversation 0 Commits 3 Files changed 7 +396
dnova commented 2026-05-29 12:41:08 -04:00
Member
Copy link

Closes #136

Closes #136
dnova changed title from Export dans la caisse to WIP: Export dans la caisse 2026-06-08 11:38:49 -04:00
This pull request has changes conflicting with the target branch.
  • client.go
  • route.go
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin export_caisse:export_caisse
git switch export_caisse

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 export_caisse
git switch export_caisse
git rebase main
git switch main
git merge --ff-only export_caisse
git switch export_caisse
git rebase main
git switch main
git merge --no-ff export_caisse
git switch main
git merge --squash export_caisse
git switch main
git merge --ff-only export_caisse
git switch main
git merge export_caisse
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug
Something is not working

  
duplicate
This issue or pull request already exists

  
enhancement
New feature

  
help wanted
Need some help

  
Important

   
invalid
Something is wrong

  
MVP

   
nice to have

   
optional

   
question
More information is needed

  
wontfix
This won't be fixed

No labels
bug
duplicate
enhancement
help wanted
Important
invalid
MVP
nice to have
optional
question
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
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
bottin/cms!170
No description provided.