Hello, I have a question to use bazaar:
I'm working on a custom branch in a launchpad team, I'm owner. I have a local repository, using like:
*bzr merge from Inkscape trunk *?bzr resolve *bzr commit -m "Update to trunk" *change code in my local branch.. *bzr commit -m "Some changes to branch" *bzr push to the branch in the team
After now, never have problems but now there is more people working on, and I want to know whats the way to be sync.
For example if I merge from the team like this: *other user PUSH some code to the branch in the team *bzr merge from branch in the team *bzr commit -m "Adding other user updates" *bzr push to the branch in the team This remove the other user push/es and be replaced well, but for my user, removing other user pushes. I think this is wrong.
Any body know a good way to archive ok? Thanks in advance, and sorry if not enought clear.