| === chihchun is now known as chihchun_afk | ||
| === chihchun_afk is now known as chihchun | ||
| === chihchun is now known as chihchun_afk | ||
| === chihchun_afk is now known as chihchun | ||
| === chihchun is now known as chihchun_afk | ||
| ScottK | If I'm using git and someone has submitted a merge proposal, where is the documentation on how do the actual merge? | 19:48 |
|---|---|---|
| cjwatson | Hm, not sure it's written down. In general, 'git remote add -f some-new-remote-name lp:~contributor/... && git merge some-new-remote-name/name-of-branch' etc. (I'd like to have a merge button, but have some more urgent things to sort out with LP git first ...) | 19:56 |
| cjwatson | Some projects have a merge robot that will respond to you setting the MP's overall status to Approved, but since you're asking I assume you don't have one of those. | 19:57 |
| ScottK | No. I don't. | 22:26 |
| ScottK | Even if you don't have the merge button, it'd help a lot to display the git command to copy/paste. | 22:26 |
| ScottK | Thanks. | 22:27 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!