s1d3sw1ped/jiggablend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 9 Wiki Activity

git: Sync develop with master #12

Merged
eva merged 4 commits from ash/sync-master-into-develop into develop 2026-09-02 13:41:16 -05:00
Conversation 0 Commits 4 Files Changed 1
+5 -1
ash commented 2026-09-02 13:33:59 -05:00
Collaborator
Copy Link
Copy Source

What

Merge master into develop to clear tree drift.

Why

Inventory found tip trees diverged (not history-only).

Test

  • git diff origin/master...HEAD should be empty or only intentional develop-only docs retained.
  • CI on the PR.

Fixes: #11

## What Merge `master` into `develop` to clear tree drift. ## Why Inventory found tip trees diverged (not history-only). ## Test - `git diff origin/master...HEAD` should be empty or only intentional develop-only docs retained. - CI on the PR. Fixes: https://git.s1d3sw1ped.com/s1d3sw1ped/jiggablend/issues/11
ash added 4 commits 2026-09-02 13:34:00 -05:00
docs: Add CONTRIBUTING.md
CI / check-and-test (pull_request) Successful in 47s
Details
5f7373a45c 
Point new contributors at develop for PRs, kernel-style commit
subjects, What/Why/Test PR bodies, and safe issue citations under
Gitea merge-text closing rules.
docs: Add CONTRIBUTING.md
CI / check-and-test (push) Successful in 51s
Details
Release Tag / release (push) Successful in 56s
Details
2fadb08bcf 
Add short contribution guide on the default branch.

Prefer develop for future PRs; keep commit subjects in area: Imperative form.
.gitea/workflows: Prefer job GITEA_TOKEN
CI / check-and-test (push) Successful in 57s
Details
Release Tag / release (push) Successful in 26s
Details
98d89c3d28 
Prefer job built-in token over secrets.RELEASE_TOKEN.

Link: #9
Co-authored-by: s1d3sw1ped_bot <s1d3sw1ped+giteabot@gmail.com>
Co-committed-by: s1d3sw1ped_bot <s1d3sw1ped+giteabot@gmail.com>
git: Sync develop with master
CI / check-and-test (pull_request) Successful in 32s
Details
d87136698c 
Bring develop tree in line with master while keeping develop-only docs that remain correct.

Link: #11
eva merged commit 7dab37c0cf into develop 2026-09-02 13:41:16 -05:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
Compat/Breaking
Breaking change that won't be backward compatible
 Kind/Bug
Something is not working
 Kind/Documentation
Documentation changes
 Kind/Enhancement
Improve existing functionality
 Kind/Feature
New functionality
 Kind/Security
This is security issue
 Kind/Testing
Issue or pull request related to testing
Priority
Critical
1
The priority is critical
Priority
High
2
The priority is high
Priority
Low
4
The priority is low
Priority
Medium
3
The priority is medium
Reviewed
Confirmed
1
Issue has been confirmed
Reviewed
Duplicate
2
This issue or pull request already exists
Reviewed
Invalid
3
Invalid issue
Reviewed
Won't Fix
3
This issue won't be fixed
Status
Abandoned
3
Somebody has started to work on this but abandoned work
Status
Blocked
1
Something is blocking this issue or pull request
Status
Need More Info
2
Feedback is required to reproduce issue or to continue work
draft
Draft for review — do not merge without Eva review
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
ash blake eva linus moss pike s1d3sw1ped
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: s1d3sw1ped/jiggablend#12
Delete Branch "ash/sync-master-into-develop"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?