Differences
This shows you the differences between two versions of the page.
Both sides previous revision Previous revision Next revision | Previous revision | ||
agasti:developer:launchpad_code_submission [2011/03/25 23:19] cheuschober |
agasti:developer:launchpad_code_submission [2011/03/26 19:02] (current) |
||
---|---|---|---|
Line 39: | Line 39: | ||
Oh, and while you're at it, we wholly recommend using [[http:// | Oh, and while you're at it, we wholly recommend using [[http:// | ||
+ | |||
+ | Once you've fixed the conflicted files, you can officially resolve the conflict by issuing the following. | ||
<code bash> | <code bash> | ||
Line 85: | Line 87: | ||
</ | </ | ||
- | In our case above, we start by pointing our merge directive back to its parent branch, this is so bzr can know what to diff against. Our send message should tell the branch maintainers what you introduced that was new and what base revision you merged from in the parent. The last file, / | + | In our case above, we start by pointing our merge directive back to its parent branch; this is so bzr can know what to diff against. Our send message should tell the branch maintainers what you introduced that was new and what base revision you merged from in the parent. The last file, / |
===== Step 6: Create a Bug Report and Add your Directive ===== | ===== Step 6: Create a Bug Report and Add your Directive ===== | ||
Line 95: | Line 97: | ||
===== Step 7: Be Patient, but Be Active! ===== | ===== Step 7: Be Patient, but Be Active! ===== | ||
- | This is perhaps the easiest step of the whole process. After you submit a merge request via your merge directive, please stick around! Hang out on IRC with us on IRC or by e-mail and be ready to answer questions about your directive. If you've created a module, pay attention to any security alerts that may arise around your new submission. It's very difficult for maintainers to justify merging code from someone who's unwilling to discuss it. | + | This is perhaps the easiest step of the whole process. After you submit a merge request via your merge directive, please stick around! Hang out with us on IRC or by e-mail and be ready to answer questions about your directive. If you've created a module, pay attention to any security alerts that may arise around your new submission. It's very difficult for maintainers to justify merging code from someone who's unwilling to discuss it. |
We also ask that you please be patient regarding your submission. We have some very smart maintainers, | We also ask that you please be patient regarding your submission. We have some very smart maintainers, |