Ask Your Question

Revision history [back]

click to hide/show revision 1
initial version

your steps looks strange, here is my steps and it works well to me:

  1. git clone $URL (get code, and the default branch name is "master")
  2. git checkout -b $my_branch_name (create my own branch)
  3. edit code under my own branch, and run unit test.
  4. git add $file_name & git commit (commit change at local)
  5. git checkout master & git remote update & git pull (update master code)
  6. git checkout $my_branch_name
  7. git rebase master
  8. Repeat steps 3 &4 is required.
  9. git review

your steps looks strange, here is my steps and it works well to me:

  1. git clone $URL (get code, and the default branch name is "master")
  2. git checkout -b $my_branch_name (create my own branch)
  3. edit code under my own branch, and run unit test.
  4. git add $file_name & git commit (commit change at local)
  5. git checkout master & git remote update & git pull (update master code)
  6. git checkout $my_branch_name
  7. git rebase master
  8. Repeat steps 3 &4 is if required.
  9. git review

your steps looks strange, here is my steps and it works well to me:

  1. git clone $URL (get code, and the default branch name is "master")
  2. git checkout -b $my_branch_name (create my own branch)
  3. edit code under my own branch, and run unit test.
  4. git add $file_name & git commit -a (commit change at local)
  5. git checkout master & git remote update & git pull (update master code)
  6. git checkout $my_branch_name
  7. git rebase master
  8. Repeat steps 3 &4 if required.
  9. git review

Looks like you need to rebase your steps looks strange, changes, here is my steps and it works well to me:steps, rebase is done by step 5-8.

  1. git clone $URL (get code, and the default branch name is "master")
  2. git checkout -b $my_branch_name (create my own branch)
  3. edit code under my own branch, and run unit test.
  4. git commit -a (commit change at local)
  5. git checkout master & git remote update & git pull (update master code)
  6. git checkout $my_branch_name
  7. git rebase master
  8. Repeat steps 3 &4 if required.
  9. git review