Skip to content
GitLab
Projects Groups Topics Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in
  • K ksonnet
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
    • Locked files
  • Issues 0
    • Issues 0
    • List
    • Boards
    • Service Desk
    • Milestones
    • Requirements
  • Merge requests 0
    • Merge requests 0
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test cases
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Container Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Code review
    • Insights
    • Issue
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • Ijaz Ahmad
  • ksonnet
  • Repository
  • ksonnet
  • pkg
  • cluster
  • merger_test.go
Find file BlameHistoryPermalink
  • bryanl's avatar
    Use object in cluster for basis for three way merge instead of new object · 12265a5f
    bryanl authored Jul 16, 2018
    
    
    This change modifies the merge strategy to use the object in the
    basis for the patch rather than the modified object. This allows
    the three way merge to detect changes in the new object.
    
    Signed-off-by: default avatarbryanl <bryanliles@gmail.com>
    12265a5f