You have it exactly right. Thanks for the reply! Really appreciate it Regarding your suggestion of merging. When I merge the 'lab' branch into the 'field' branch does the lab brand not cease to exist ? So when I want to work on the lab code is would have to rebranch and do the whole lab setup. Maybe I'm confused about branching, haven't done it in a while. Also, your suggestion about separating the difference in 'lab' and 'field' code into a config file or using flags as you suggested is probably the real solution to the problem. Cherry commits work okay but they are easy to mess up and definitely not ideal for this situation
... View more
Hopefully this is not a dumb question. I have a situation where my project needs to run on two different machines. One is a machine in my lab and the other is on an embedded system in the field. The project is completely python so architecture differences don't really matter. The issue is that there are slight changes that need to me made to make the code work on the machine in the field. So we created a separate branch for the machine in the field. Now when we develop new features on the machine in the lab and need to pass these features on to the machine in the field we use cherry pick commits to bring the new feature into the branch for the machine in the field. Is this a good way of doing this ?
... View more