Changes between Version 3 and Version 4 of control-panel/common-tasks
- Timestamp:
- Jan 4, 2014, 7:41:17 PM (10 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
control-panel/common-tasks
v3 v4 1 [[PageOutline]] 2 1 3 = Common tasks UI Improvements = 2 4 … … 11 13 == Using git == 12 14 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, p erferably with the ticket number you're fixing (ex: `git commit -m "added reset password dialog fix #8175"`)15 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, preferably with the ticket number you're fixing (ex: `git commit -m "added reset password dialog fix #8175"`) 14 16 15 17 If 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! 16 18 17 It is suggested that you name the branch after the ticket number you are working on (e g`git branch ticket_1234`).19 It is suggested that you name the branch after the ticket number you are working on (e.g. `git branch ticket_1234`). 18 20 19 If you aren't working on a ticket then prefix your branch name with your initials. (e g`dh_new_branch`)21 If you aren't working on a ticket then prefix your branch name with your initials. (e.g. `dh_new_branch`) 20 22 21 23 === Understanding red dev git branches === … … 31 33 The red development environment lives at [https://red.dev.mayfirst.org/] on rose.mayfirst.org. 32 34 33 This environment pulls from the red git hubrepo at `git://git.mayfirst.org/mfpl/red`35 This environment pulls from the red git repo at `git://git.mayfirst.org/mfpl/red` 34 36 35 37 To pull updates simply log in to the red.dev.mayfirst.org hosting order using `ssh red.dev@rose.mayfirst.org` … … 54 56 On the red.dev.mayfirst.org server: 55 57 {{{ 56 cd red.dev.mayfirst.org/web/57 git pull origin you _branch_name58 cd ~/red.dev.mayfirst.org/web/ 59 git pull origin your_branch_name 58 60 git checkout your_branch_name 59 61 }}} … … 65 67 == When your code is ready for prime time == 66 68 67 Once you've tho ughly 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:69 Once 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: 68 70 69 71 {{{