Advertisement
jiue123

git document

Sep 25th, 2016
85
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.86 KB | None | 0 0
  1. // Xóa các git status đỏ (modified)
  2. git rm .gitattributes
  3. git rm --cached -r .
  4. git reset --hard
  5. git status
  6. git pull origin nar_migration
  7.  
  8. --------------------------------------------------------------------------------------------------------
  9. //git reset like server
  10. git fetch origin
  11. git reset --hard origin/feature/xxxx
  12.  
  13. //review gitlab or start new task
  14. 1. reset like server
  15. 2. merge nar_migration (git pull origin nar_migration)
  16. 3. merge nar_develop (git pull origin nar_develop)
  17. 4. code
  18. // <migration commit >
  19. // function commit
  20. 5. nar_migration cherry pick <migration commit> and push code to nar_migration
  21. 6. check conflict and check diff nar_develop
  22. git merge nar_develop --no-ff
  23. git diff HEAD..nar_develop --stat
  24. 7. push code.
  25.  
  26. -------------------------------------------------------------------------------------------------------
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement