Skip to content

Navigation Menu

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.

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

jpedroh / last-merge Public

Notifications You must be signed in to change notification settings
Fork 0
Star 2

Code
Issues 2
Pull requests
Actions
Projects
Security
Insights

Additional navigation options

Code
Issues
Pull requests
Actions
Projects
Security
Insights

feat: cover more cases in ordered merge algorithm.#5

Merged

jpedroh merged 4 commits intomainjpedroh/last-merge:mainfrom feat-add-another-casesjpedroh/last-merge:feat-add-another-casesCopy head branch name to clipboard

Oct 24, 2023

+707-421

Conversation Commits4 (4)Checks Files changed

Commits

Commits on Oct 24, 2023

feat: add case in which one parent removes a node and adds another
jpedroh
committed
feat: implement first conflict case
jpedroh
committed
feat: Add case in which both parents add different nodes
jpedroh
committed
refactor: move ordered merge into a separate file
jpedroh
committed

Footer

© 2025 GitHub, Inc.

Footer navigation

Terms
Privacy
Security
Status
Docs
Contact

You can’t perform that action at this time.