Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Jérome Perrin
erp5
Repository
dea9c839d2866e5c12f55a504f8739b2133e992b
Switch branch/tag
erp5
..
transitions
resolve_conflict_with_merge.xml
Find file
Blame
History
Permalink
Revert "workflow: add workflow transition guard for non-user actions as well."
· dea9c839
Jérome Perrin
authored
Jan 29, 2016
This reverts commit
f0808ac6
.
dea9c839
resolve_conflict_with_merge.xml
1.88 KB
Edit
Web IDE
Replace resolve_conflict_with_merge.xml
×
Attach a file by drag & drop or
click to upload
Commit message
Replace resolve_conflict_with_merge.xml
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
