Staging
v0.5.1
Revision b2ec3615c81ca4f3c938245842a45956da8d5acb authored by Ammar Askar on 27 January 2018, 20:53:56 UTC, committed by Berker Peksag on 27 January 2018, 20:53:56 UTC
Travis when merging changes from a pull request onto the target branch
does not perform a rebase, instead it does a simple merge which causes
the PR commits to retain their commit dates. This means that the commit
log can potentially look like:

PR merge <-- HEAD
normal master commit <- master
more commits from normal workflow
PR commit 1
another master commit
PR commit 2

Performing a git diff from PR commit 2 to master will accidentally
include files that should not be there.

Closes python/core-workflow#14
1 parent b1a6ac4
History
File Mode Size
Grammar -rw-r--r-- 6.3 KB

back to top