Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Ignore merge target when replacing template branch name. #97

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Commits on Jun 29, 2016

  1. Ignore merge target when replacing template branch name.

    This allows you to have builds using `master` as a template, but still have
    the build merge with master as part of the build config and not have that
    get replaced with a command to merge it with itself.
    
    It seems extremely unlikely that one would want to specify a merge command
    in the template build that would merge the template branch into itself,
    and expect that cloned builds would also be expected to merge into themselves.
    Much more likely is that the merge command is added specifically so cloned
    builds will attempt to merge into the template branch as part of the build
    process to ensure the code that would be built / tested is able to be merged.
    putermancer committed Jun 29, 2016
    Configuration menu
    Copy the full SHA
    7386085 View commit details
    Browse the repository at this point in the history