Skip to content

Navigation Menu

Appearance settings

Explore
By company size
By use case
By industry
View all solutions
Topics
- AI
- DevOps
- Security
- Software Development
- View all
Explore
- GitHub Sponsors
  Fund open source developers
- The ReadME Project
  GitHub community articles
Repositories
- Enterprise platform
  AI-powered developer platform
Available add-ons
Pricing

Search code, repositories, users, issues, pull requests...

Search

Clear

Search syntax tips

Provide feedback

We read every piece of feedback, and take your input very seriously.

Include my email address so I can be contacted

Saved searches

Use saved searches to filter your results more quickly

Name

Query

To see all available qualifiers, see our documentation.

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

Expensify / App Public

Notifications You must be signed in to change notification settings
Fork 3.3k
Star 4.4k

Code
Issues 1.6k
Pull requests 522
Actions
Projects 2
Security
Insights

Additional navigation options

Code
Issues
Pull requests
Actions
Projects
Security
Insights

[No QA] Fix CP conflict resolution#22724

Merged

roryabraham merged 8 commits intomainExpensify/App:mainfrom

Rory-FixCPResolveConflictsExpensify/App:Rory-FixCPResolveConflictsCopy head branch name to clipboard

Jul 12, 2023

Conversation Commits8 (8)Checks Files changed

Merged

[No QA] Fix CP conflict resolution#22724
roryabraham merged 8 commits intomainfrom
Rory-FixCPResolveConflicts

Commits

Commits on Jul 11, 2023

Update tests to more accurately represent real-world CPs
roryabraham
committed
Create getPreviousVersion action
roryabraham
committed
Read version from package.json
roryabraham
committed
Fetch the correct history in the cherryPick.yml workflow
roryabraham
committed

Commits on Jul 12, 2023

Fix incorrect line break
roryabraham
committed
Merge branch 'main' into Rory-FixCPResolveConflicts
roryabraham
committed
Fix unrelated tests
roryabraham
committed
Throw error if semverLevel not valid
roryabraham
committed

Footer

© 2025 GitHub, Inc.

Footer navigation

Terms
Privacy
Security
Status
Docs
Contact

You can’t perform that action at this time.