https://pantsbuild.org/ logo
Powered by
#general
  • b

    bright-dinner-81701

    09/24/2015, 8:38 PM
    oh
  • b

    bright-dinner-81701

    09/24/2015, 8:38 PM
    ive been merging master
  • b

    bright-dinner-81701

    09/24/2015, 8:38 PM
    do i need to rebase always?
  • w

    witty-crayon-22786

    09/24/2015, 8:38 PM
    no
  • e

    enough-analyst-54434

    09/24/2015, 8:38 PM
    no - just a style
  • b

    bright-dinner-81701

    09/24/2015, 8:38 PM
    ok
  • w

    witty-crayon-22786

    09/24/2015, 8:38 PM
    did you commit something to master accidentally?
  • e

    enough-analyst-54434

    09/24/2015, 8:39 PM
    You can always git diff master..HEAD > /tmp.patch
  • e

    enough-analyst-54434

    09/24/2015, 8:39 PM
    start a new branch
  • e

    enough-analyst-54434

    09/24/2015, 8:39 PM
    git apply /tmp/patch
  • e

    enough-analyst-54434

    09/24/2015, 8:39 PM
    to get a clean single commit thats hard to fool RB with
  • b

    bright-dinner-81701

    09/24/2015, 8:40 PM
    alright
  • e

    enough-analyst-54434

    09/24/2015, 8:40 PM
    merge is the devils tool!
  • w

    witty-crayon-22786

    09/24/2015, 8:40 PM
    lol.
  • w

    witty-crayon-22786

    09/24/2015, 8:40 PM
    @enough-analyst-54434: so github pull requests then?
  • w

    witty-crayon-22786

    09/24/2015, 8:40 PM
    they actually render the commits
  • e

    enough-analyst-54434

    09/24/2015, 8:43 PM
    not exactly following
  • b

    bright-dinner-81701

    09/24/2015, 8:43 PM
    bah
  • e

    enough-analyst-54434

    09/24/2015, 8:43 PM
    I use 
    curl -L [PR].patch | git am -3
    for pull requests
  • b

    bright-dinner-81701

    09/24/2015, 8:44 PM
    ok git apply on branch right off of master
  • b

    bright-dinner-81701

    09/24/2015, 8:44 PM
    still says no diff
  • e

    enough-analyst-54434

    09/24/2015, 8:44 PM
    --parent=master - still?
  • b

    bright-dinner-81701

    09/24/2015, 8:44 PM
    i pass —parent=master to rbt?
  • e

    enough-analyst-54434

    09/24/2015, 8:44 PM
    yes
  • e

    enough-analyst-54434

    09/24/2015, 8:44 PM
    I always pass it explicitly, not sure the default
  • e

    enough-analyst-54434

    09/24/2015, 8:45 PM
    Do you use tracking branches? ie: 
    git checkout -b fred origin/master
    ?
  • e

    enough-analyst-54434

    09/24/2015, 8:45 PM
    rbt may expect you use a tracking branch?
  • e

    enough-analyst-54434

    09/24/2015, 8:45 PM
    I always use one
  • b

    bright-dinner-81701

    09/24/2015, 8:45 PM
    woo ok with the —parent=master even my original branch worked
  • b

    bright-dinner-81701

    09/24/2015, 8:45 PM
1...455456457...2420Latest