OSDev.org

The Place to Start for Operating System Developers
It is currently Sun May 31, 2020 5:46 am

All times are UTC - 6 hours




Post new topic Reply to topic  [ 2 posts ] 
Author Message
 Post subject: Main/Trunk and what's else?
PostPosted: Thu Feb 27, 2020 8:00 pm 
Offline
Member
Member
User avatar

Joined: Fri Nov 22, 2019 5:46 am
Posts: 95
I've read the Osdev.org wiki about Code managment and the wikipedia article about version control. And this page:

https://betterexplained.com/articles/a- ... n-control/

This page mentions Trunk/Main. And it says that the main code goes in there. But what goes into the OTHER areas? Non-code? Tools? Usage examples? How can a developer pretend there were unimportant code parts? They are all important! I don't understand it. I already searched the forum for trunk.


Top
 Profile  
 
 Post subject: Re: Main/Trunk and what's else?
PostPosted: Thu Feb 27, 2020 9:17 pm 
Offline
Member
Member

Joined: Wed Aug 30, 2017 8:24 am
Posts: 457
The current state of development goes into the trunk/master branch. That one is supposed to be relatively stable. When you start development on a new feature, or you chase a bug, you create a branch from there, develop the feature on the branch, then merge the branch back. This allows you to have multiple outstanding changes at the same time. In professional development, usually the person merging the branch is not the person developing it, and they do a code review along with the merge. Also, typically multiple branches are outstanding at the same time, with multiple people working on each.

For hobby OSDev, you may find it useful to create branches to focus your efforts. Especially when starting out, there is so much to do it can be hard to focus. But then, while chasing issue A, you don't want to get bogged down with issue B along the way. Also, since the master is supposed to be relatively stable, you always have a version available that at least boots and runs.

Once time comes to create a release, you can create a tag from the master branch. You can also tag branch revisions, but I find that to be weird.


Top
 Profile  
 
Display posts from previous:  Sort by  
Post new topic Reply to topic  [ 2 posts ] 

All times are UTC - 6 hours


Who is online

Users browsing this forum: No registered users and 2 guests


You cannot post new topics in this forum
You cannot reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum
You cannot post attachments in this forum

Search for:
Jump to:  
Powered by phpBB © 2000, 2002, 2005, 2007 phpBB Group