Skip to content
Navigation Menu
Sign in
Appearance settings
Platform
AI CODE CREATION
GitHub Copilot
Write better code with AI
GitHub Copilot app
Direct agents from issue to merge
MCP Registry
Integrate external tools
DEVELOPER WORKFLOWS
Actions
Automate any workflow
Codespaces
Instant dev environments
Issues
Plan and track work
Code Review
Manage code changes
Code Quality
Enforce quality at merge
APPLICATION SECURITY
GitHub Advanced Security
Find and fix vulnerabilities
Code security
Secure your code as you build
Secret protection
Stop leaks before they start
EXPLORE
Why GitHub
Documentation
Blog
Changelog
Marketplace
View all features
Solutions
BY COMPANY SIZE
Enterprises
Small and medium teams
Startups
Nonprofits
BY USE CASE
App Modernization
DevSecOps
DevOps
CI/CD
View all use cases
BY INDUSTRY
Healthcare
Financial services
Manufacturing
Government
View all industries
View all solutions
Resources
EXPLORE BY TOPIC
AI
Software Development
DevOps
Security
View all topics
EXPLORE BY TYPE
Customer stories
Events & webinars
Ebooks & reports
Business insights
GitHub Skills
SUPPORT & SERVICES
Documentation
Customer support
Community forum
Trust center
Partners
View all resources
Open Source
COMMUNITY
GitHub Sponsors
Fund open source developers
PROGRAMS
Security Lab
Maintainer Community
GitHub Stars
Archive Program
REPOSITORIES
Topics
Trending
Collections
Enterprise
ENTERPRISE SOLUTIONS
Enterprise platform
AI-powered developer platform
AVAILABLE ADD-ONS
GitHub Advanced Security
Enterprise-grade security features
Copilot for Business
Enterprise-grade AI features
Premium Support
Enterprise-grade 24/7 support
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 }}
zegl
/
goriak
Public
Notifications
You must be signed in to change notification settings
Fork
6
Star
30
Code
Issues
3
Pull requests
1
Actions
Projects
Security and quality
0
Insights
Additional navigation options
Code
Issues
Pull requests
Actions
Projects
Security and quality
Insights
Commits
Breadcrumbs
History for
goriak
siblings_test.go
on
v3
User selector
All users
Datepicker
All time
Commit history
Commits on Feb 9, 2017
Bugfix for conflict resolution in GetRaw()
zegl
committed
e8bc7cc
View commit details
Copy full SHA for e8bc7cc
View code at this point
Browse repository at this point
Commits on Jan 26, 2017
#45 - Merge Result.VClock and Context
zegl
committed
86462a5
View commit details
Copy full SHA for 86462a5
View code at this point
Browse repository at this point
Commits on Jan 23, 2017
#43 - More progress. Tests can successfully compile
zegl
committed
06301fd
View commit details
Copy full SHA for 06301fd
View code at this point
Browse repository at this point
Commits on Dec 28, 2016
resolve typos found by misspell tool
zegl
committed
1487fff
View commit details
Copy full SHA for 1487fff
View code at this point
Browse repository at this point
resolve issues found by ineffassign
zegl
committed
d02fc45
View commit details
Copy full SHA for d02fc45
View code at this point
Browse repository at this point
Commits on Nov 25, 2016
Custom Conflict Resolution (#28)
Show description for 1c4a6c1
zegl
authored
1c4a6c1
View commit details
Copy full SHA for 1c4a6c1
View code at this point
Browse repository at this point
Loading
You can’t perform that action at this time.