Whiskey Web and Whatnot: Web Development, Neat cover image

Developing Orbit and the Future of Cross Framework Solutions with Dan Gebhardt

Whiskey Web and Whatnot: Web Development, Neat

00:00

Fork and Merge - Is There a Conflict in Orbit?

Forking and merging is like being able to check out a new branch andg and try an experiment. And then just throw that away if it doesn't work out. So, so in that case, how does it flag that there is a conflict when you issue a bno emerge? You would first see if the main branch has had any commits to it. If it hasn't, then you're in the clear. Now, if it has changed, then you, you know, you can still merge, and it's going to try to apply those that merge. But of course, say, you're just creating a conflict that that merge might w could potentially fail,. In which case

Transcript
Play full episode

The AI-powered Podcast Player

Save insights by tapping your headphones, chat with episodes, discover the best highlights - and more!
App store bannerPlay store banner
Get the app