Skip to content
Snippets Groups Projects
Select Git revision
2 results Searching

vagrant

  • Clone with SSH
  • Clone with HTTPS
  • intrigeri's avatar
    intrigeri authored
    First, the base branch merge is not done in auto/build anymore: it's been done
    in auto/config for a while.
    
    Second, auto/config now merges the base branch via the desired commit
    ID ($BASE_BRANCH_GIT_COMMIT), so it does not _directly_ need origin/$base_branch
    to be a valid ref. Instead, it now relies on $BASE_BRANCH_GIT_COMMIT to be set
    by our Rakefile.
    75e64f74
    History