Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
digital-edition-editor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
gutzkow
digital-edition-editor
Commits
f38d7b26
Commit
f38d7b26
authored
5 years ago
by
Mark Hall
Browse files
Options
Downloads
Patches
Plain Diff
Handle merge errors more cleanly
parent
856e06d6
No related branches found
No related tags found
Loading
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGES.md
+2
-0
2 additions, 0 deletions
CHANGES.md
editor/views/repository.py
+10
-6
10 additions, 6 deletions
editor/views/repository.py
with
12 additions
and
6 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
