Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
J
jami-client-ios
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
31
Issues
31
List
Boards
Labels
Service Desk
Milestones
Iterations
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Analytics
Analytics
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
savoirfairelinux
jami-client-ios
Repository
34ceed01789c6da17d7f781d0353e1d28216e770
Switch branch/tag
ring-client-ios
.gitattributes
Find file
Blame
History
Permalink
project: add merge union git strategy
· eaacc4f6
Thibault Wittemberg
authored
Jul 31, 2017
Change-Id: If739cd0a33789981feab1f20bf85c9f849c8e93b
eaacc4f6
.gitattributes
22 Bytes
Edit
Web IDE
Replace .gitattributes
×
Attach a file by drag & drop or
click to upload
Commit message
Replace .gitattributes
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.