[roll] Roll infra/recipes [cherry_pick] Remove merge --strategy=theirs option This option was introduced as a hack to allow cherry-picks of integration.git rolls. While this smoothens the possibility of doing so without encountering merge conflicts, it can lead to unexpected behavior as seen in fxbug.dev/77443. Cherry-picking rolls has always been an anti-pattern (cherry-picking CLs or using update-petal has always been the "right" way to pull in such updates), so I'm removing the option to do so unless the merge is actually clean. Original-Bug: 77443 Original-Reviewed-on: https://fuchsia-review.googlesource.com/c/infra/recipes/+/534683 Original-Revision: 7c964e141b28d5683ea54bc8758b46d13383dc4f GitOrigin-RevId: 80390444d0989279b593463edeb97bfb3ce2f86b Change-Id: Ib504f73b35b4bf1377f073927f524def77ec40a4
This repository contains Fuchsia's Global Integration manifest files.
All changes should be made to the internal version of this repository. Our infrastructure automatically updates this version when the internal one changes.
Currently all changes must be made by a Google employee. Non-Google employees wishing to make a change can ask for assistance via the IRC channel #fuchsia on Freenode.
First install Jiri.
Next run:
$ jiri init $ jiri import minimal https://fuchsia.googlesource.com/integration $ jiri update
Third party projects should have their own subdirectory in ./third_party.