This little article explains how you should keep your branches in sync with iceberg or (in worst-case scenario) from the command line.

These are the things I do all the time, if you have other cases, or you want to add anything, just tell.

Guille
--