Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
ZODB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
ZODB
Repository
b74eef767952daf6b972511e9bba389be00955be
Switch branch/tag
ZODB
src
ZODB
ConflictResolution.py
Find file
Blame
History
Permalink
Call _p_resolveConflict() even if a conflicting change doesn't change the state
· b74eef76
Julien Muchembled
authored
Aug 20, 2016
This reverts to the behaviour of 3.10.3 and older.
b74eef76
ConflictResolution.py
10.8 KB
Edit
Web IDE
Replace ConflictResolution.py
×
Attach a file by drag & drop or
click to upload
Commit message
Replace ConflictResolution.py
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
