search

Opentrons / buildroot

The Opentrons fork of buildroot for building the OT2 system. Our default branch is opentrons-develop.
http://buildroot.org
Other
10 stars 7 forks source link

chore(release): merge changes from RS v7.2.2 (BR v1.17.6) into opentrons-develop #230

Closed y3rsh closed 6 months ago

y3rsh commented 6 months ago

Merge back of the newly established release branch.

git switch release && git pull
git switch opentrons-develop && git pull
git merge --no-ff release -m "chore(release): merge changes from RS v7.2.2 and BR v1.17.6 in to opentrons-develop"
# resolve merge conflicts if necessary
git push origin opentrons-develop