#neverforget git da moçada
Always use small commits, specific for each separate task you are doing. This is necessary in order to:.
- Create a consistent history of changes in the repo, making it easy for other developers to understand what was going on at a given period of time
- Make it easier to revert specific changes if that is ever necessary
- More about this here
- Or in english here
Always use rebase to update your feature branches before merging into develop. This helps maintain a clear history and prevents overly complicated merge conflicts. However, be careful to NEVER rebase a branch that is being used by someone other than yourself, that could cause very difficult issues to solve.
Avoid creating staging branches that cannot be merged into master, try to configure the differences between the environments in places other than the source code itself. This makes your delivering process much easier and reduces the risk for conflicts drastically.