Git Merge Request #47: Ticket #7929. (rejected)

Merging...

Merged

Something went wrong. Please, merge manually

Checking if merge is possible...

Something went wrong. Please, merge manually

Pranav Sharma wants to merge 0 commits from /u/pranav/allura/ to master, 2015-11-30

Now the voting is enabled by default.

Determining commits...

Discussion

  • Dave Brondsema

    Dave Brondsema - 2015-11-09

    This looks like its on the right track, however it is hard to check and test it since the commits include some old merges and conflict resolutions. Would you mind resetting or rebasing your master branch to match the latest from Allura? Then make a new commit with just the necessary changes. That would be best. Thanks.

    Also, as far as the actual changes go, in the test_vote method, you can removing the few lines for "enable voting" since it will be already enabled now.

     

    • Pranav Sharma - 2015-11-29

      From which repo and branch do I have to rebase? The dev or the master?

       

      • Igor Bondarenko - 2015-11-29

        Rebase on master. We don't use dev anymore.

         

  • Pranav Sharma - 2015-11-30

    I don't want this merge to be completed anymore. I would work in the way as explained by heiths now. So this can be rejected.

     

    • Dave Brondsema

      Dave Brondsema - 2015-11-30

      Sounds good, I'll close this one out then.

       

  • Dave Brondsema

    Dave Brondsema - 2015-11-30
    • Status: open --> rejected
     

Log in to post a comment.