Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- // Xóa các git status đỏ (modified)
- git rm .gitattributes
- git rm --cached -r .
- git reset --hard
- git status
- git pull origin nar_migration
- --------------------------------------------------------------------------------------------------------
- //git reset like server
- git fetch origin
- git reset --hard origin/feature/xxxx
- //review gitlab or start new task
- 1. reset like server
- 2. merge nar_migration (git pull origin nar_migration)
- 3. merge nar_develop (git pull origin nar_develop)
- 4. code
- // <migration commit >
- // function commit
- 5. nar_migration cherry pick <migration commit> and push code to nar_migration
- 6. check conflict and check diff nar_develop
- git merge nar_develop --no-ff
- git diff HEAD..nar_develop --stat
- 7. push code.
- -------------------------------------------------------------------------------------------------------
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement