On 05/05/2014 01:21 PM, Quim Gil wrote:
I created https://www.mediawiki.org/wiki/Requests_for_comment/Phabricator/versus_Bugzillato consolidate the relevant information for bug reporters.
https://www.mediawiki.org/wiki/Requests_for_comment/Phabricator/versus_Bugzilla
Phabricator still does not work directly with Git, right? Or has that been implemented since I last checked? If not, what is the planned workaround for Phabricator?
arc/arcanist is a wrapper around git (it also uses a Phabricator API called Conduit for a few things) that is used mainly for network operations (e.g. pushing a new patch).
git is still used for local operations, and the repo is cloneable without needing arc.
We have also talked about having a GitHub->Phabricator bridge, so drive-by contributors could make a GitHub pull request without learning arc right away.
The default workflow is to use arcanist to merge the code into Git directly. Does that handle merge conflicts? What is the rebase process?
I'm not sure exactly how conflicts are handled. However, what I do know is that you can amend a differential (which is essentially similar to a Gerrit change) with a new diff. A diff, using Phabricator terminology, is one or more commits.
So if there's a conflict, you should be able to amend locally then update the differential, similar to Gerrit. I don't know if they have a rebase button on the site similar to Gerrit.
Matt Flaschen _______________________________________________ Wikitech-l mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/wikitech-l
