wiki/man - updates to the merge finish process

[Christian Ehrhardt ]

Hi,
various things I found not up-to-date in the wiki and the man page today.
But I want you to change it to avoid me making it worse, so here suggestions.

1. wiki: Run git ubuntu merge finish ubuntu/devel. This effectively wraps all of the following steps, which can be run manually instead, if desired.

=> no with the snap the individual steps won't work. We should take them out of the wiki and just describe what it does

2. wiki: since auto-created changelogs often still suck (commit mesdsage discipline, also we lack detection of dropped) we should add a statement to check and if needed correct/extend the changelog.

3. man page: this has a double "merge"
`git-ubuntu merge merge start` must have been run first.

[Nish Aravamudan (nacc)]

Now that we have manpages, would you be willing to take a crack at updating them / wiki appropriately?

[Christian Ehrhardt  (paelzer)]

Done #1 and #2, looking at the new man-pages now what might be added.

[Christian Ehrhardt  (paelzer)]

#3 is done already in the man page in the current master branch.
So fix Released, thanks for all your work.

BTW - have you found a way to deliver man pages for the snap integrated in the hosts "man" (I have seen no update on 1699526 nor on the core issue in bug 1575593 for quite a while).

[Nish Aravamudan (nacc)]

The best we can do is what I said in one of my announce e-mails:

- To setup the manpage lookup via our snapped manpage vieiwer:

edit ~/.gitconfig with the following contents:

[man "git-ubuntu-man"]
    cmd = git-ubuntu.man
[man]
    viewer = git-ubuntu-man
    viewer = man

On Wed, Oct 25, 2017 at 6:23 AM, ChristianEhrhardt
<email address hidden> wrote:
> #3 is done already in the man page in the current master branch.
> So fix Released, thanks for all your work.
>
> BTW - have you found a way to deliver man pages for the snap integrated
> in the hosts "man" (I have seen no update on 1699526 nor on the core
> issue in bug 1575593 for quite a while).
>
> ** Changed in: usd-importer
> Status: Triaged => Fix Released
>
> --
> You received this bug notification because you are a member of Ubuntu
> Server Dev import team, which is subscribed to usd-importer.
> https://bugs.launchpad.net/bugs/1699517
>
> Title:
> wiki/man - updates to the merge finish process
>
> To manage notifications about this bug go to:
> https://bugs.launchpad.net/usd-importer/+bug/1699517/+subscriptions