How to update your main branch:

For updating but keeping your changes see rebase.