Trying to push when there are still merge conflicts Rafael Lopes commited on 9 May 2017 Facebook Twitter Email PreviousNext