« Blu-Ray nanopatterns to boost solar (PV) efficiency

HOWTO: Test and merge github pull-requests locally

Today, another pull-request flew in, enhancing the picoreflow software stack with MAX6675 compatibility. Git and github are great tools for open collaboration but it takes some time to get used to them. Of course, the github auto-merge feature is great and works pretty reliable, but I still prefer to review and test PR's locally on the commandline, before actually merging them.

Github also offers some command line foo for this, as you can see in the screenshot above but I'd like to use this opportunity to share another way how to test, handle and merge github pull requests even more easily and comfortably, in case you're new to git/github and don't know about this yet in a real-world, step-by-step example.

Adding pull refs to your .git/config

Just go into the directory where you store the git repo you have received a pull request for and open .git/config in an editor. You'll find a section that looks like this (with your repo names of course).

[remote "origin"]
     url = git@github.com:apollo-ng/picoReflow.git
     fetch = +refs/heads/*:refs/remotes/origin/*

We just have to add another fetch target so our git knows where to fetch pr's from github:

fetch = +refs/pull/*/head:refs/remotes/origin/pr/*

Now the section should look like this.

[remote "origin"]
     url = git@github.com:apollo-ng/picoReflow.git
     fetch = +refs/heads/*:refs/remotes/origin/*
     fetch = +refs/pull/*/head:refs/remotes/origin/pr/*

This has to be done only once per project/repo. Afterwards you can just start with Step 1:

Simple 4-Step Fetch/Test/Merge/Push

Step 1: Fetch & checkout the pull request

When receiving a new pull request on github, you'll get a notification with the pull request's id, like this:

https://github.com/apollo-ng/picoReflow/pull/7.

Now we just have to fetch from origin to see if it pops up:

 $ git fetch origin
From github.com:apollo-ng/picoReflow
 * [new ref]         refs/pull/7/head -> origin/pr/7

Good, PR #7 is here and we can just switch over to it (checkout):

$ git checkout pr/7
Branch pr/7 set up to track remote branch pr/7 from origin.
Switched to a new branch 'pr/7'

Step 2: Do your worst (Testing)

Review and test the new code.

Step 3: Merge the pull-request

Once testing is finished and everything seems to be in order, we merge the pull request into the branch we want, in this case the master branch, so let's checkout master:

$ git checkout master

Finally we merge the pull request into the master branch and since github already told us that it could merge the PR automatically, we don't expect to be confronted with any merge conflicts:

$ git merge pr/7
Merge made by the 'recursive' strategy.
 config.py.EXAMPLE |   3 +++
 lib/max6675.py    | 125 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/oven.py       |  20 ++++++++++++++++++--
 3 files changed, 146 insertions(+), 2 deletions(-)
 create mode 100644 lib/max6675.py

Step 4: Push

Now we just have to push it back to github which will automagically mark the pull request as closed/merged and notify the pull request initiator.

$ git push

Done. Easy, right?

git, github, merge, test, pull-request, howto

Discussion

OKBet, 2023/10/21 06:22

This blog is really great. The information here will surely be of some help to me. Thanks! horse racing betting game

yanmaneee, 2023/11/05 09:18

claudiapatric, 2023/12/18 14:31

Dobrý den, vítejte v přední světové organizaci řidičských průkazů. Prodáváme legální a registrované české řidičské průkazy registrované ve vládním databázovém systému i v různých autoškolách, se kterými spolupracujeme. Všichni víme, že jako český občan lze získat český řidičský průkaz po absolvování kurzu řidičské výchovy a složení dvoustupňové zkoušky: teoretické a řidičské. https://koupit-ridicsky-prukaz.com/

Comprare patente di guida reale e registrata sul nostro sito web senza sostenere alcun esame o fare la prova pratica. tutto ciò di cui abbiamo bisogno sono i tuoi dati e verranno registrati nel sistema entro i prossimi otto giorni. Le patenti di guida devono seguire la stessa procedura di registrazione di quelle rilasciate nelle autoscuole. https://www.comprarelapatentediguidaregistrataonline.com/

Echter Führerschein und auf unserer Website registriert, ohne eine Prüfung abzulegen oder die praktische Prüfung abzulegen. Wir benötigen lediglich Ihre Daten und diese werden innerhalb der nächsten acht Tage im System angemeldet. Der Führerschein muss das gleiche Registrierungsverfahren durchlaufen wie die Führerscheine, die in Fahrschulen ausgestellt werden. https://fuhrerscheinkaufen-b.com/

Koop een echt authentiek en geregistreerd rijbewijs in minder dan 7 werkdagen. Ingeschreven bij de gewenste database en gemeente, zonder het praktische of theoretische deel van de examens af te leggen. https://rijbewijskopenonline-r.com/

Köp ett registrerat Sverige körkort utan examen eller praktisk examen. Om du är myndig och fortfarande har svårt att ta ett registrerat körkort antingen på grund av ett teoriprov eller brist på tid att studera, då är du på rätt plats. Köp körkort https://xn--kpakrkort-online-mwbd.com/

Permis de conducere real si inregistrat pe site-ul nostru fara a sustine nici un examen sau a sustine proba practica. tot ce avem nevoie sunt detaliile dvs. și vor fi conectate în sistem în următoarele opt zile. Permisul de conducere trebuie să treacă prin aceeași procedură de înregistrare ca și cele eliberate la școlile de șoferi, https://cumparapermisuldeconducereonline.com/

Prawdziwe prawo jazdy i zarejestrowane na naszej stronie internetowej bez zdawania egzaminu lub egzaminu praktycznego. potrzebujemy tylko twoich danych, które zostaną zalogowane do systemu w ciągu najbliższych ośmiu dni. Prawo jazdy musi przejść taką samą procedurę rejestracji, jak wydawane w szkołach nauki jazdy, https://kupprawojazdyonline.com/

Buy Undetectable Counterfeit Notes. We are the best and Unique producer of High Quality Undetectable Counterfeit Banknotes. With over a billion of our products circulating around the world. We offer only original high-quality counterfeit currency Notes. We ship worldwide. We also print and sell Grade A banknotes of over 52 currencies in the world. https://buyundetectablecounterfeitnotes.com/

claudiapatric, 2023/12/18 14:33

https://koupit-ridicsky-prukaz.com/

https://www.comprarelapatentediguidaregistrataonline.com/

https://cumparapermisuldeconducereonline.com/

https://fuhrerscheinkaufen-b.com/

https://kupprawojazdyonline.com/

https://rijbewijskopenonline-r.com/

https://xn--kpakrkort-online-mwbd.com/

https://buyundetectablecounterfeitnotes.com/

https://regalocachorros.com/

https://regalocachorros.com/ Regalo Excelentes cachorros, todos los cachorros están sanos y Vienen con su pedigrí, vacunados, desparasitados y con microchip. Amplias garantías sanitarias. Son machos y hembras.