Merg­ing vs stash­ing

net magazine - - EXCHANGE/Q&AS -

What are your thoughts on merg­ing ver­sus stash­ing/re­bas­ing? Si­mon Owen, Manch­ester, UK EJW: Do what­ever works for your team. Need a very clean history? Use re­base to up­date branches and merge --ff-only to in­cor­po­rate con­trib­u­tor work. Need to cater to novice con­trib­u­tors? Al­low branches to be up­dated via merge (no one will die. I tried it once for science). If you want to do The Right Thing, I’ve cre­ated a flow chart to help you de­cide (see above).

Newspapers in English

Newspapers from Australia

© PressReader. All rights reserved.