conflict-main #31

Open

loan wants to merge 0 commits from conflict-main into main

pull from: conflict-main

merge into: yaal:main

yaal:main

Conversation 0 Commits - Files changed -

loan commented 2026-01-08 18:10:00 +01:00

Owner

Copy link

No description provided.

loan added 11 commits 2026-01-08 18:10:00 +01:00

feat: process stats according to employee evolution f20b2f4222

feat: fill time on a project related contract 9c8b453bad

feat: only production contract can have billed time 2c4f244fd6

feat: edit values for production contracts 2a6096863a

feat: display occupation percentage 926177ee8c

fix: display real available employees a98644cfea

feat: edit only billed amount for result contracts af8b8d93e7

feat: tweak contract model ebc30c2fa0

feat: add allowance on contracts 67cb506b4a

feat: monthly revenue of result contract processing 4d58162242

fix: clean start on tests 6ac7b1ba76

loan force-pushed conflict-main from 6ac7b1ba76 to 5059052822 2026-01-08 18:42:55 +01:00 Compare

Some checks failed

Hide all checks

ci/woodpecker/pr/lint Pipeline failed

Details

ci/woodpecker/pr/tests unknown status

Details

ci/woodpecker/push/lint Pipeline failed

Details

ci/woodpecker/push/tests unknown status

Details

This branch is already included in the target branch. There is nothing to merge.

View command line instructions

Checkout

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

git fetch -u origin conflict-main:conflict-main

git switch conflict-main

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 conflict-main

git switch conflict-main

git rebase main

git switch main

git merge --ff-only conflict-main

git switch conflict-main

git rebase main

git switch main

git merge --no-ff conflict-main

git switch main

git merge --squash conflict-main

git switch main

git merge --ff-only conflict-main

git switch main

git merge conflict-main

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

yaal/sisyphe!31

No description provided.