Merge proposal page should tell you how to merge the branch
Bug #303172 reported by
James Westby
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Launchpad itself |
Fix Released
|
Low
|
James Westby | ||
Bug Description
Hi,
The branch page tells you how to get a branch, and how to push to it
if you are the owner.
The merge proposal page should tell you how to merge the branch.
While explaining the whole process would not really be possible at least
putting "bzr merge lp..." would be a good start.
Thanks,
James
Related branches
lp:~james-w/launchpad/merge-proposal-instructions
- Paul Hummer (community): Approve (code)
-
Diff: 52 lines (+10/-1)3 files modifiedlib/lp/code/stories/branches/xx-branchmergeproposals.txt (+4/-1)
lib/lp/code/stories/branches/xx-propose-for-merging.txt (+2/-0)
lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt (+4/-0)
| Changed in launchpad-bazaar: | |
| assignee: | nobody → rockstar |
| importance: | Undecided → Low |
| status: | New → Triaged |
Revision history for this message
| Paul Hummer (rockstar) wrote | #1 |
| Changed in launchpad-code: | |
| assignee: | Paul Hummer (rockstar) → nobody |
Revision history for this message
| Ursula Junque (ursinha) wrote Bug fixed by a commit | #2 |
| Changed in launchpad-code: | |
| assignee: | nobody → James Westby (james-w) |
| milestone: | none → 10.04 |
| status: | Triaged → Fix Committed |
| tags: | added: qa-needstesting |
Revision history for this message
| James Westby (james-w) wrote | #3 |
| tags: |
added: qa-ok removed: qa-needstesting |
| Changed in launchpad-code: | |
| status: | Fix Committed → Fix Released |
To post a comment you must log in.
How should this be presented to the user? I think something as simple as `bzr merge lp...` is probably the best best, instead of saying something like "Go to your local copy of the target branch and then bzr merge..."