Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
aura
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AURA
aura
Repository
Project 'aura/meta' was moved to 'aura/aura'. Please update any links and bookmarks that may still have the old path.
ec3c753d34ccb0269969808ac7dc28fff2ff1648
Select Git revision
Branches
20
main
default
protected
alpha6-prep
fix-engine-api-nginx
protected
fix-certificate-persistence
protected
fix-auto-deployment
protected
fix-dashboard-steering-ports
protected
alpha5-prep
fix-https-behind-reverse-proxy
protected
fix-linuxserver-http
protected
feat-linuxserver-nginx
protected
fix-playout-dependencies
protected
develop
docs-image-management
dev-pipewire-server
recorder-updates
fix-pipeline-running-on-non-main
protected
ext-docs
fix-engine-api-connectivity
protected
fix-aura-sysuser
protected
1.0.0-alpha4-prep
Tags
7
1.0.0-alpha6
protected
1.0.0-alpha5
protected
1.0.0-alpha5-hotfix1
protected
1.0.0-alpha4
protected
1.0.0-alpha3
protected
1.0.0-alpha2
protected
1.0.0-alpha1
protected
27 results
aura
docs
development
conflict-resolution.md
Find file
Blame
Permalink
3 years ago
3de84d62
Update conflict-resolution.md
· 3de84d62
Ingo Leindecker
authored
3 years ago
3de84d62
History
Update conflict-resolution.md
Ingo Leindecker
authored
3 years ago