What is the recommended workflow for creating and submitting changes to calibre? Last night I was surprised to see that changes in my branch on Launchpad were merged into calibre. I had not requested the merge and was still working on it. That's ok, but it made me wonder if I was doing something wrong and should be using a different process.
Here's my workflow:
- bzr branch lp:calibre. I only need to do this once, right?
- bzr push lp:~mp/calibre/mybranch to create my new working branch on Launchpad.
- bzr pull to keep my checkout up-to-date.
- bzr commit occasionally to save my work.
- Request a merge via Launchpad when I am satisfied that my changes are safe to include.
Is this right? I've only done up to #4 but my changes were merged. Should I use a different process? Things were fine now but I am worried about if I make GUI changes that are experimental and things break. I want to make things easy on everyone.
I have no experience with version control systems and, despite reading the bzr manual, I am barely understanding the concepts of branching, merging, etc. Feel free to explain things to me like I'm a three-year-old.
