Git Merge Request #49: Ticket #8018 (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

Resolved.

Determining commits...

Discussion

  • Heith Seewald - 2015-11-19

    Hey Pranav -- nice work man :)

    A few quick notes:

    1. To stay consistent throughout the codebase, we indent with 4 spaces instead of tabs. You should be able to setup your editor for that. Mixed tabs and spaces can cause issues.
    2. It would be nice to toss in a quick assertion -- maybe somewhere around allura/tests/functional/test_auth.py:737
    3. When submitting a merge request, try to limit the commits to only the ones relevant to what you want merged :)

    Other than that -- your fix seems to work well.

     

  • Heith Seewald - 2015-11-19

    Here is a quick outline of how Dave and I typically work:

    Create a new branch from master:

    git checkout -b ps/8018

    ps being your initials and 8018 the ticket number you're working on.
    Make all the changes for that ticket and commit/push them to your fork.

    git add allura/controllers/auth.py
    git commit -m '[#8018] Make first confirmed email become the primary'
    git push

    Then when you submit for a merge request, you'd select: From ps/8018 To: master.

    You don't have to do it the same way -- but it might help keep your fork organized.

     

    • Pranav Sharma - 2015-11-30

      Thanks Heith. Reject this requet. I will start in the way you explained from the beginning.

       

  • Heith Seewald - 2015-11-30
    • Status: open --> rejected
     

Log in to post a comment.