summaryrefslogtreecommitdiff
path: root/releasenotes/notes/configure-github-merge-method-6d2991b9e5b98b6c.yaml
Commit message (Collapse)AuthorAgeFilesLines
* Allow to select the merge method in GithubMarkus Hosch2019-06-111-0/+4
Instead of creating a merge commit, Github also allows for two other options, squash and rebase. This change makes the github reporter aware of the merge-mode which already can be set. For now only merge and merge-resolve are supported which both map to the Github merge mode 'merge'. The other two merge modes that are supported by Github are not yet supported by the merger and will be implemented in later changes. Change-Id: I3d51261f248072d2e3ee7e3212377f81b9a41010 Co-Authored-By: Tobias Henkel <tobias.henkel@bmw.de>