Skip to content
Reed A. Cartwright edited this page Sep 14, 2015 · 6 revisions

Squashing a branch before issuing a pull request

  1. Review log and write comprehensive commit message

  2. Squash branch and add commit message to beginning of log:

     git checkout feature/xyz
     git rebase -i develop
    
  3. If needed issue git mergetool -t meld to resolve issues. And git rebase --continue to continue.

Building a Linux binary on CentOS 5

In order to build a Linux binary that will work on most systems, use an old version of Linux. We have chosen CentOS 5, which first came out in 2007.

  1. Download ISO from http://isoredirect.centos.org/centos/5/isos/x86_64/ and install it on a virtual machine.
  2. Install Developer Toolset 2.1 from http://linux.web.cern.ch/linux/devtoolset/#dts21
  3. Extract CMake binary from http://www.cmake.org/download/
  4. Enable the toolset from the command line: scl enable devtoolset-2 bash
  5. Configure DeNovoGear with the flags -DBUILD_EXTERNAL_PROJECTS=1 -DUSE_STATIC_LIBS=1 -DCMAKE_BUILD_TYPE=Release
Clone this wiki locally