Skip to content
Navigation Menu
Sign in
Products
Platform
GitHub
Repository hosting, code review, and collaboration
Copilot
AI coding agent for tasks, projects and automated work
Build & Ship
Actions
CI/CD and automation
Code Quality
Quality analysis, fixes, and enforcement
Codespaces
Cloud development environments
Secure
Code Security
Vulnerability detection and remediation
Secret Protection
Secret scanning and leak prevention
All Features
Developers
Learn
Documentation
Training
Certifications
Build
Build with Copilot
Customize Copilot
Integrations
Explore
Trending repos
GitHub Sponsors
Events
Changelog
Changelog
Your source for the latest features, improvements, and fixes across GitHub products, all in one place.
Businesses
By Stage
Enterprises
Team
Startups
Nonprofits
By Industry
Healthcare
Financial services
Manufacturing
Government
See all industries
Evaluate GitHub
Why GitHub
Customer Stories
Business insights
Trust Center
Add-ons
GitHub Advanced Security
Enterprise-grade code security
Copilot for business
Enterprise-grade AI features
Premium Support
Enterprise-grade 24/7 support
Resources
Learn & Connect
Documentation
Resource center
Blog
Events & webinars
Community Forum
Customer Stories
Integrations
Support
Customer support
Training
GitHub Status
Company
About
Partners
Changelog
GitHub Universe
GitHub Universe
The event for developers, by developers — talks, workshops, and what’s next for GitHub.
Pricing
Search
/
Sign in
Sign up
Appearance settings
You signed in with another tab or window.
Reload
to refresh your session.
You signed out in another tab or window.
Reload
to refresh your session.
You switched accounts on another tab or window.
Reload
to refresh your session.
Dismiss alert
{{ message }}
OpenFn
kit
Repository navigation
Code
Issues
273
(273)
Pull requests
9
(9)
Actions
Projects
Wiki
Security and quality
Insights
More
items
Cli merge with abort rebase
- #1094
#1094
Merged
josephjclark
merged 11 commits into
release/next
OpenFn/kit:release/next
from
cli-merge-with-abort-rebase
OpenFn/kit:cli-merge-with-abort-rebase
Copy head branch name to clipboard
Oct 24, 2025
Conversation
Commits
11
(11)
Checks
Files changed
Merged
Cli merge with abort rebase
#1094
josephjclark
merged 11 commits into
release/next
OpenFn/kit:release/next
from
cli-merge-with-abort-rebase
OpenFn/kit:cli-merge-with-abort-rebase
Copy head branch name to clipboard
Commits
Commits on Oct 24, 2025
changeset
josephjclark
committed
f955548
View commit details
Copy full SHA for f955548
Browse repository at this point
feat: workflow merge compatibility
doc-han
authored and
josephjclark
committed
d2e0651
View commit details
Copy full SHA for d2e0651
Browse repository at this point
feat: add history to workflow property
doc-han
authored and
josephjclark
committed
4e30d4b
View commit details
Copy full SHA for 4e30d4b
Browse repository at this point
feat: error when there are incompatible workflows
doc-han
authored and
josephjclark
committed
2cc1d63
View commit details
Copy full SHA for 2cc1d63
Browse repository at this point
feat: ignore incompatibility when force passed
doc-han
authored and
josephjclark
committed
261d5b8
View commit details
Copy full SHA for 261d5b8
Browse repository at this point
tests: fix workflow check
doc-han
authored and
josephjclark
committed
94e5d93
View commit details
Copy full SHA for 94e5d93
Browse repository at this point
tests: incompatibility merging via project class
doc-han
authored and
josephjclark
committed
54a12b8
View commit details
Copy full SHA for 54a12b8
Browse repository at this point
tests: fix error wording
doc-han
authored and
josephjclark
committed
70bb12c
View commit details
Copy full SHA for 70bb12c
Browse repository at this point
chore: updates
doc-han
authored and
josephjclark
committed
590ce79
View commit details
Copy full SHA for 590ce79
Browse repository at this point
conflict
josephjclark
committed
9130cbc
View commit details
Copy full SHA for 9130cbc
Browse repository at this point
changeset
josephjclark
committed
b9cb060
View commit details
Copy full SHA for b9cb060
Browse repository at this point
You can’t perform that action at this time.