best practices
| Term | Defination |
|---|---|
| Checkout | |
| Cherry Pick | |
| Clone | |
| Commit | |
| Merge | |
| Rebase |
if you create a PR that have merge conflicts (dev -> master), you can update the PR using following method
- go to dev
- take pull of master
- resolve conflicts
- push dev again (PR will be updated with resolved conflicts)