lab209b3 / zephyr_tutorial_vn

1 stars 0 forks source link

5 documentation about using timer #20

Closed baobuibk closed 3 months ago

baobuibk commented 3 months ago

@TransistorTun em phải merge với cái remote master mới nhất trước Theo tutorial này nhé

https://stackoverflow.com/questions/47029731/git-get-latest-changes-before-pushing-a-branch

  1. Go to master branch with: git checkout master
  2. Update your local master with: git pull origin master
  3. Resolve conflicts (if applicable)
  4. Go back to features with: git checkout features
  5. Merge master branch over features with: git merge master
  6. Push changes with: git push origin features

Lưu ý: feature là cái branch của em (5-documentation about timer)