← Back to team overview

launchpad-doc team mailing list archive

[Bug 337329] [NEW] Help on "proposal to merge"

 

You have been subscribed to a public bug:

Concerning that page: https://help.launchpad.net/BranchMergeProposals ,
I hope this is the right place to ask this :-)

The first step of "Registering a merge proposal" is as follows:
"Step 1: Visit the overview page of your branch that you want to merge with someone else's branch."
I think it would be clearer to say something like
"Step 1: Visit the overview page of your branch (source) that you want to merge into someone else's branch (target)."
But I'm not sure if that change is correct.

Furthermore, there is 
"Step 4: If the source branch is not a direct branch of the target, use the Dependent branch field to specify the source branch's parent."
I think I'm blind, but I see no HTML-Field named "Dependent branch" on the merge proposal page.

Last but not least, the help stops right where it gets to the good part
- you can figure out most of what's this help page is about, but it
would be nice to know, how in the end the merge can be done. After
setting everything to "approved", I saw the differences between the
branches on the merge proposal page, no conflicts, so I waited (related
to Bug #332021 ) for launchpad doing this merge. As nothing happened, I
guess I have to merge branches manually via bash, but I have not tried
that yet.  Not really bad if its missing, but nice to know :-)


Thanks for Launchpad!
Tiefflieger

** Affects: launchpad-documentation
     Importance: Medium
     Assignee: Matthew Revell (matthew.revell)
         Status: Triaged

-- 
Help on "proposal to merge"
https://bugs.edge.launchpad.net/bugs/337329
You received this bug notification because you are a member of Launchpad Documentation Team, which is subscribed to Launchpad Documentation.