Changes between Version 3 and Version 4 of control-panel/common-tasks


Ignore:
Timestamp:
Jan 4, 2014, 7:41:17 PM (6 years ago)
Author:
Daniel Kahn Gillmor
Comment:

minor cleanup

Legend:

Unmodified
Added
Removed
Modified
  • control-panel/common-tasks

    v3 v4  
     1[[PageOutline]]
     2
    13= Common tasks UI Improvements =
    24
     
    1113== Using git ==
    1214
    13 If you're just editing a few lines of code and suspect it will only take you a single commit to work your magic, just make the commit to the `dev` branch. Be sure to leave a good commit comment, perferably with the ticket number you're fixing (ex: `git commit -m "added reset password dialog fix #8175"`)
     15If you're just editing a few lines of code and suspect it will only take you a single commit to work your magic, just make the commit to the `dev` branch. Be sure to leave a good commit comment, preferably with the ticket number you're fixing (ex: `git commit -m "added reset password dialog fix #8175"`)
    1416
    1517If your edits might require more than one commit create a new branch `git checkout -b ticket_0000` (this command will create a new branch then switch to it). Remember, you can make a new branch any time while editing the code!
    1618
    17 It is suggested that you name the branch after the ticket number you are working on (eg `git branch ticket_1234`).
     19It is suggested that you name the branch after the ticket number you are working on (e.g. `git branch ticket_1234`).
    1820
    19 If you aren't working on a ticket then prefix your branch name with your initials. (eg `dh_new_branch`)
     21If you aren't working on a ticket then prefix your branch name with your initials. (e.g. `dh_new_branch`)
    2022
    2123=== Understanding red dev git branches ===
     
    3133The red development environment lives at [https://red.dev.mayfirst.org/] on rose.mayfirst.org.
    3234
    33 This environment pulls from the red github repo at `git://git.mayfirst.org/mfpl/red`
     35This environment pulls from the red git repo at `git://git.mayfirst.org/mfpl/red`
    3436
    3537To pull updates simply log in to the red.dev.mayfirst.org hosting order using `ssh red.dev@rose.mayfirst.org`
     
    5456On the red.dev.mayfirst.org server:
    5557{{{
    56 cd red.dev.mayfirst.org/web/
    57 git pull origin you_branch_name
     58cd ~/red.dev.mayfirst.org/web/
     59git pull origin your_branch_name
    5860git checkout your_branch_name
    5961}}}
     
    6567== When your code is ready for prime time ==
    6668
    67 Once you've thoughly tested and shared your changes from the dev branch and everyone is happy with the great work you've done feel free to merge your changes into the master branch and push those changes to the red dev repo. This process should look something like this:
     69Once you've thoroughly tested and shared your changes from the dev branch and everyone is happy with the great work you've done feel free to merge your changes into the master branch and push those changes to the red dev repo. This process should look something like this:
    6870
    6971{{{