Merge two branches of your project. You can view details of the files that will be affected, see if there are any conflicts and resolve these conflicts manually.

{{day.events.length}} event{{day.events.length > 1 ? 's' : ''}} on {{day.date | date}}

{{event.type | typeToName}} - {{event.author}} - {{event.creationDate | friendlyTimeDeltaShort}}
```
{{event.message}}
```

{{mergeRequestInfo.diff.changedFiles}} changed files - {{mergeRequestInfo.diff.addedLines}} additions - {{mergeRequestInfo.diff.removedLines}} deletions

{{nbConflictingFiles}} / {{editableFiles.length}} file{{nbConflictingFiles > 1 ? 's' : ''}} in conflict

{{file.filename}}

{{file.nbConflicts | pluralize:'conflict':'conflicts'}}

{{file.state}}

{{file.filepath}}

</div>
                    </div>
                    <div ng-if="isOpen && nbConflictingFiles === 0 && !activeFile"
                         class="empty-list-cta">
                        <div data-block="empty">
                            <img src="static/dataiku/images/merge-request-ready-to-merge.svg" alt="Please wait" height="192" width="192"/>
                            <h1>All good, you can merge <span class="git-branch-name">{{mergeRequest.branchToMerge}}</span> into <span class="git-branch-name">{{mergeRequest.baseBranch}}</span></h1>
                            <p>This branch has no conflicts with the base branch, merge can be performed.</p>
                        </div>
                    </div>
                    <div ng-if="activeFile && !activeFile.hasData"
                         class="empty-list-cta">
                        <div data-block="empty">
                            <h1>Unable to edit this conflict</h1>
                            <p>{{activeFile.reason}}</p>
                            <div ng-if="activeFile.state === 'conflicting'">
                                <button type="submit"
                                        class="btn btn--primary"
                                        ng-click="resolveWithStrategy('MASTER')">
                                    Resolve with {{mergeRequest.baseBranch}} version
                                </button>
                                <button type="submit"
                                        class="btn btn--primary mleft16"
                                        ng-click="resolveWithStrategy('BRANCH')">
                                    Resolve with {{mergeRequest.branchToMerge}} version
                                </button>                                
                            </div>
                        </div>
                    </div>
                </div>
            </div>
        </div>
    </div>
</div>