#general
- h
happy-kitchen-89482
10/10/2015, 2:29 AMIt's so irritating - h
happy-kitchen-89482
10/10/2015, 2:29 AMyou get errors that are seemingly impossible, because of code you know nothing about yet - e
enough-analyst-54434
10/10/2015, 2:29 AMI really don't like merge at all in any use case - h
happy-kitchen-89482
10/10/2015, 2:29 AMwell, merge or rebase isn't the issue here - h
happy-kitchen-89482
10/10/2015, 2:30 AMTravis should run your code as-is, not attempt to be clever - e
enough-analyst-54434
10/10/2015, 2:30 AMIt should just use your tip period - h
happy-kitchen-89482
10/10/2015, 2:30 AMexactly - h
happy-kitchen-89482
10/10/2015, 2:30 AMI wonder if that's an option - e
enough-analyst-54434
10/10/2015, 2:30 AMSo you basically have to do this seperate fix on master - h
happy-kitchen-89482
10/10/2015, 2:30 AMYes - h
happy-kitchen-89482
10/10/2015, 2:30 AMIt's pure luck that d724e241 isn't failing - h
happy-kitchen-89482
10/10/2015, 2:31 AMI can fix this in my change, - e
enough-analyst-54434
10/10/2015, 2:31 AMWell, we could always git in the ci.sh script - e
enough-analyst-54434
10/10/2015, 2:31 AMit would mess with travis's UI a bit - e
enough-analyst-54434
10/10/2015, 2:32 AMBasically reset --hard to the PR tip - e
enough-analyst-54434
10/10/2015, 2:32 AMI'm sure there is enough env var info to figure that out - h
happy-kitchen-89482
10/10/2015, 2:33 AMSounds fragile-ish, I'm hoping there's an easier way - h
happy-kitchen-89482
10/10/2015, 2:33 AMLike travis config or something - h
happy-kitchen-89482
10/10/2015, 2:33 AMor maybe it's a github thing - e
enough-analyst-54434
10/10/2015, 2:33 AMDefinitely not via UI, still reading docs for .travis.yml - h
happy-kitchen-89482
10/10/2015, 2:35 AMI've noticed that if there's a merge conflict travis does nothing, and the pull request tells you about the conflict - h
happy-kitchen-89482
10/10/2015, 2:35 AMso maybe this is all on the github side - e
enough-analyst-54434
10/10/2015, 2:35 AMNope - don;t think so - e
enough-analyst-54434
10/10/2015, 2:36 AMLooked at master CI and your PR CI - they run different in the git section - e
enough-analyst-54434
10/10/2015, 2:36 AMI think what we want only happens for 'build on push' - e
enough-analyst-54434
10/10/2015, 2:36 AMWhich is how master builds - e
enough-analyst-54434
10/10/2015, 2:36 AMSo if folks wanted this, they'd need to turn travis on for their clone - e
enough-analyst-54434
10/10/2015, 2:37 AMunless we let people start pushing their branches to the main origin - e
enough-analyst-54434
10/10/2015, 2:40 AMNo good ideas here - e
enough-analyst-54434
10/10/2015, 2:43 AMTRAVIS_PULL_REQUEST is the env var that will be present with the PR id to act on if we were to use a hard reset