method of using bzr

[Dan 'Da Man']

Hello all,

I know people are busy trying to meet the upcoming freeze/deadline,
but I wanted to ask a quick question about using Bazaar.  I
encountered a situation where I started to make a revision on what I
thought was a updated branch (I inputted the bzr update command and it
stated the branch was updated to whatever number. but I later
discovered there were other subsequent revisions that were made to the
same branch.  I pulled the newer revisions after making my revisions,
then I was not able to resolve the conflicts between the newer file
and the one that I altered.  I was wondering if someone could provide
some suggestions on how they make revisions, maintain an updated
branch and resolve any conflicts that may arise.

Thanks,

Dano