Branch Housekeeping

With MonoGame 3.0 being released the MonoGame team will be taking some time to do some long needed housekeeping. Our first step is to clean up the structure of our branches on Github. This post is intended to convey our goals, the steps we plan to make, and how they affect downstream forks.
If you work with our GitHub repo please read on to learn about the changes coming next week!
Our primary goal is to return to using a simplified git-flow branch structure. This will make development easier to manage and allow for more frequent stable releases moving forward.
The current MonoGame branch structure is this:
- Master - 2.x stable.
- Develop - 2.x development.
- Develop3d - 3.x development.
- syderis
- Rotation_Ipad2
- flyingdevchanges
In hindsight it probably would have been better to simply do 2.x hotfixes than to split development into two branches for an extended period. There are also a bunch of old branches in there that have already been merged into develop/develop3d.
We plan to transform the branches back into this:
- Master - 3.x stable.
- Develop - 3.x development.
We will be making these changes using a merge "ours strategy". This will eliminate most all problems for downstream users and is extremely easy to do.
So what does this mean to you?
Actually not all that much.
If you are working out of the develop branch in your fork your next merge of upstream/develop will get you up to date with the 3.x development branch. If you don't want this then do not merge upstream changes. You can always reference one of the tags to get old versions of MonoGame.
If you are working out of the develop3d branch in your fork you simply need to start merging from upstream/develop. Or if you happen to have set the remote tracking branch you can change it like so:
git branch -u upstream/develop
Note that the upstream/develop3d branch will still work, but it will no longer recieve updates moving forward. We will also reject any pull requests submitted to develop3d.
Finally if you have an existing pull request open againt develop3d you will simply need to close it and resubmit it against the develop branch. All new pull requests going forward must be submited to the develop branch.
And according to our tests that is all you need to know. We will post another notice next week after the change occurs reminding you of all this.
If you have any additional questions or concerns let us know!
Comments
jeff (not verified)
Fri, 02/08/2013 - 11:27
Permalink
when will this happen?
when will this happen?
Tom Spilman
Fri, 02/08/2013 - 20:54
Permalink
The plan is to do it this
The plan is to do it this coming Wednesday.
Bradly (not verified)
Sat, 05/18/2013 - 11:44
Permalink
Add new comment | MonoGame
Thanks on your marvelous posting! I really enjoyed reading
it, you can be a great author.I will make sure to bookmark
your blog and will come back down the road. I want to encourage one to continue your great work, have a nice day!
My spouse and I absolutely love your blog and find
nearly all of your post's to be just what I'm looking for.
Would you offer guest writers to write content in your case?
I wouldn't mind publishing a post or elaborating on most of the subjects you write regarding here. Again, awesome site!
We stumbled over here from a different web address and thought I may as well check things out. I like what I see so now i am following you. Look forward to looking into your web page for a second time.
I love what you guys are usually up too. This kind of clever work and coverage! Keep up the superb works guys I've added you guys to blogroll.
Hello there I am so happy I found your website, I really found you by error, while I was
browsing on Aol for something else, Anyways I am here now and would just like to say kudos for
a tremendous post and a all round enjoyable blog (I also love the theme/design), I don’t have time to read through it all at the
moment but I have book-marked it and also added your RSS feeds, so when I have time I will be back to read a great deal more, Please do keep up
the fantastic work.
Admiring the commitment you put into your site and detailed information you provide.
It's nice to come across a blog every once in a while that isn't the same out
of date rehashed material. Wonderful read! I've saved your site and I'm
including your RSS feeds to my Google account.
Hello! I've been following your site for a while now and finally got the bravery to go ahead and give you a shout out from Humble Tx! Just wanted to mention keep up the excellent job!
I am really enjoying the theme/design of your site. Do you ever run into any internet browser compatibility problems? A couple of my blog visitors have complained about my website not working correctly in Explorer but looks great in Firefox. Do you have any recommendations to help fix this issue?
I'm curious to find out what blog system you are working with?
I'm experiencing some small security issues with my latest website and I would like to find something more secure. Do you have any suggestions?
Hmm it appears like your website ate my first comment (it was extremely long) so I guess I'll just sum it up what I had written and say, I'm thoroughly enjoying your blog. I as well am an aspiring blog writer but I'm
still new to the whole thing. Do you have any suggestions for rookie blog writers?
I'd certainly appreciate it.
Woah! I'm really digging the template/theme of this site.
It's simple, yet effective. A lot of times it's hard to get that "perfect balance" between usability and visual appeal.
I must say you have done a awesome job with this.
Also, the blog loads very fast for me on Chrome.
Excellent Blog!
Do you mind if I quote a few of your articles as long
as I provide credit and sources back to your website?
My website is in the very same area of interest as
yours and my visitors would genuinely benefit from some of the
information you provide here. Please let me know if this okay with
you. Cheers!
Howdy would you mind letting me know which webhost you're using? I've loaded your blog
in 3 different internet browsers and I must say
this blog loads a lot faster then most. Can you recommend a good internet hosting provider at a reasonable price?
Thanks a lot, I appreciate it!
Great site you have here but I was wanting to know if you
knew of any message boards that cover the same topics
talked about in this article? I'd really love to be a part of group where I can get feed-back from other experienced individuals that share the same interest. If you have any recommendations, please let me know. Many thanks!
Hi! This is my first comment here so I just wanted to give a quick shout out and tell you I truly enjoy reading through your blog posts. Can you suggest any other blogs/websites/forums that deal with the same subjects? Thanks!
Do you have a spam issue on this blog; I also am a blogger, and I was wanting to know your situation; many of us have developed some nice procedures and we are looking to swap solutions with other folks, why not shoot me an email if interested.
Please let me know if you're looking for a article author for your blog.
You have some really good posts and I feel I would be a good asset.
If you ever want to take some of the load off, I'd love to write some material for your blog in exchange for a link back to mine. Please blast me an email if interested. Thanks!
Have you ever considered about including a little bit more than just your articles? I mean, what you say is valuable and all. But think about if you added some great images or videos to give your posts more, "pop"! Your content is excellent but with images and videos, this website could definitely be one of the greatest in its field. Awesome blog!
Interesting blog! Is your theme custom made or did you download it from somewhere? A design like yours with a few simple adjustements would really make my blog stand out. Please let me know where you got your design. Thanks a lot
Hey there would you mind sharing which blog platform you're working with?
I'm planning to start my own blog soon but I'm having a hard time choosing between BlogEngine/Wordpress/B2evolution and Drupal.
The reason I ask is because your design seems different then most blogs and I'm looking for something unique. P.S My apologies for being off-topic but I had to ask!
Howdy just wanted to give you a quick heads up. The words in your content seem to be running off the screen in Chrome. I'm not
sure if this is a format issue or something to do with
web browser compatibility but I figured I'd post to let you know. The style and design look great though! Hope you get the issue fixed soon. Many thanks
With havin so much written content do you ever run into any problems of plagorism or copyright infringement? My website has a lot of exclusive content I've either created myself or outsourced but it seems a lot of it
is popping it up all over the web without my authorization.
Do you know any techniques to help stop content from being stolen?
I'd genuinely appreciate it.
Have you ever considered publishing an ebook or guest authoring on other blogs? I have a blog based on the same information you discuss and would love to have you share some stories/information. I know my readers would appreciate your work. If you're even remotely interested, feel free
to shoot me an email.
Hey! Someone in my Facebook group shared this website with us so I came to
take a look. I'm definitely loving the information. I'm bookmarking and
will be tweeting this to my followers! Outstanding blog and amazing style and
design.
Wonderful blog! Do you have any tips and hints for aspiring writers?
I'm hoping to start my own website soon but I'm a little lost on everything.
Would you suggest starting with a free platform like
Wordpress or go for a paid option? There are so many choices out there that I'm totally confused .. Any ideas? Bless you!
My developer is trying to persuade me to move to .net from PHP. I have always disliked the idea because of the costs. But he's tryiong none
the less. I've been using WordPress on various websites for about a year and am concerned about switching to another platform. I have heard great things about blogengine.net. Is there a way I can import all my wordpress posts into it? Any kind of help would be really appreciated!
Does your website have a contact page? I'm having a tough time locating it but, I'd like to shoot you an email. I've got some recommendations for your blog
you might be interested in hearing. Either way, great website and I
look forward to seeing it develop over time.
It's a pity you don't have a donate button!
I'd without a doubt donate to this superb blog! I guess for now i'll settle for book-marking and adding your RSS feed to my Google account.
I look forward to fresh updates and will talk about this website with my Facebook group.
Chat soon!
Greetings from Ohio! I'm bored to death at work so I decided to browse your blog on my iphone during lunch break. I enjoy the knowledge you present here and can't wait
to take a look when I get home. I'm shocked at how fast your blog loaded on my phone .. I'm not even using WIFI, just 3G .
. Anyhow, wonderful site!
Good day! I know this is kinda off topic but I'd figured I'd ask.
Would you be interested in trading links or maybe guest writing a
blog post or vice-versa? My blog covers a lot of the same subjects as yours and I feel
we could greatly benefit from each other. If you are interested feel free
to shoot me an e-mail. I look forward to hearing from
you! Excellent blog by the way!
Right now it seems like Movable Type is the preferred blogging platform available right now.
(from what I've read) Is that what you're using on your blog?
Wonderful post however , I was wondering if you could write a litte
more on this subject? I'd be very grateful if you could elaborate a little bit further. Bless you!
Greetings! I know this is somewhat off topic but I was wondering if you knew where I could get a captcha plugin for my comment form? I'm using the same blog platform as yours and I'm having trouble finding one? Thanks a lot!
When I initially commented I clicked the "Notify me when new comments are added" checkbox and now each time a comment is added I get three e-mails with the same comment. Is there any way you can remove me from that service? Thanks a lot!
Hi! This is my first visit to your blog! We are a collection of volunteers and starting a new project in a community in the same niche. Your blog provided us beneficial information to work on. You have done a marvellous job!
Howdy! I know this is kind of off topic but I was wondering which blog platform are you using for this site? I'm getting sick
and tired of Wordpress because I've had issues with hackers and I'm looking at alternatives for another platform.
I would be fantastic if you could point me in the direction of a good platform.
Hey there! This post couldn't be written any better! Reading through this post reminds me of my old room mate! He always kept chatting about this. I will forward this page to him. Pretty sure he will have a good read. Thank you for sharing!
Write more, thats all I have to say. Literally, it seems as though you relied on the video to make your point. You clearly know what youre talking about, why waste your intelligence on just posting videos to your site when you could be giving us something enlightening to read?
Today, I went to the beach front with my children. I found a sea shell and gave it to my 4 year old daughter and said "You can hear the ocean if you put this to your ear." She placed the shell to her ear and screamed. There was a hermit crab inside and it pinched her ear. She never wants to go back! LoL I know this is completely off topic but I had to tell someone!
Yesterday, while I was at work, my sister stole my iPad and tested to see if it can survive a 40 foot drop, just so she can be a youtube sensation. My iPad is now broken and she has 83 views. I know this is totally off topic but I had to share it with someone!
I was wondering if you ever thought of changing the layout of your website? Its very well written; I love what youve got to say. But maybe you could a little more in the way of content so people could connect with it better. Youve got an awful lot of text for only having 1 or two pictures. Maybe you could space it out better?
Howdy, i read your blog from time to time and i own a similar one and i was just curious if you get a lot of spam responses? If so how do you prevent it, any plugin or anything you can suggest? I get so much lately it's driving me
insane so any help is very much appreciated.
This design is wicked! You obviously know how to keep a reader
entertained. Between your wit and your videos,
I was almost moved to start my own blog (well, almost.
..HaHa!) Excellent job. I really loved what you had to
say, and more than that, how you presented it. Too cool!
I'm truly enjoying the design and layout of your site. It's a very easy on the
eyes which makes it much more pleasant for me to come here and visit more often.
Did you hire out a designer to create your theme?
Superb work!
Hi there! I could have sworn I've been to this blog before but after checking through some of the post I realized it's new to me.
Anyhow, I'm definitely delighted I found it and I'll be
bookmarking and checking back often!
Hello! Would you mind if I share your blog with
my twitter group? There's a lot of folks that I think would really enjoy your content. Please let me know. Many thanks
Hey there, I think your site might be having browser compatibility issues. When I look at your blog in Safari, it looks fine but when opening in Internet Explorer, it has some overlapping. I just wanted to give you a quick heads up! Other then that, superb blog!
Sweet blog! I found it while browsing on Yahoo News. Do you have any tips on how to get listed in Yahoo News? I've been trying for a while but I never
seem to get there! Thanks
Hello there! This is kind of off topic but I need some
help from an established blog. Is it tough to set up your own
blog? I'm not very techincal but I can figure things out pretty fast. I'm thinking about making my own but I'm not sure where to start. Do you have any ideas or suggestions? With thanks
Howdy! Quick question that's entirely off topic.
Do you know how to make your site mobile friendly? My blog looks weird
when viewing from my iphone4. I'm trying to find a theme or plugin that might be able to resolve this issue. If you have any suggestions, please share. With thanks!
I’m not that much of a online reader to be honest but your blogs really nice, keep it up! I'll go ahead and bookmark your website to come back
later on. Many thanks
I love your blog.. very nice colors & theme. Did you make this website yourself or did you hire someone to do it for you?
Plz reply as I'm looking to create my own blog and would like to find out where u got this from. many thanks
Wow! This blog looks exactly like my old one! It's on a entirely different
topic but it has pretty much the same layout and design.
Wonderful choice of colors!
Howdy just wanted to give you a quick heads up and let you
know a few of the pictures aren't loading properly. I'm not sure why but I think its a linking issue.
I've tried it in two different internet browsers and both show the same outcome.
Heya are using Wordpress for your blog platform? I'm new to
the blog world but I'm trying to get started and set up my own. Do you require any html coding knowledge to make your own blog? Any help would be really appreciated!
Hi there this is kind of of off topic but I was wondering if blogs use WYSIWYG editors or if you have to manually code with HTML. I'm starting
a blog soon but have no coding expertise so I wanted to get
guidance from someone with experience. Any help would
be greatly appreciated!
Hello! I just wanted to ask if you ever have any issues with hackers?
My last blog (wordpress) was hacked and I ended up losing many months of hard work due to no backup.
Do you have any solutions to prevent hackers?
Good day! Do you use Twitter? I'd like to follow you if that would be okay. I'm absolutely enjoying your blog and look forward to new updates.
Hi there! Do you know if they make any plugins to safeguard against hackers?
I'm kinda paranoid about losing everything I've worked hard on.
Any suggestions?
Hey there! Do you know if they make any plugins to help with SEO?
I'm trying to get my blog to rank for some targeted keywords but I'm not seeing very good success.
If you know of any please share. Appreciate it!
I know this if off topic but I'm looking into starting my own blog and was curious what all is required to get setup? I'm assuming having
a blog like yours would cost a pretty penny?
I'm not very internet savvy so I'm not 100% certain.
Any recommendations or advice would be greatly appreciated.
Cheers
Hmm is anyone else having problems with the images on this blog loading?
I'm trying to determine if its a problem on my end or if it's the
blog. Any feed-back would be greatly appreciated.
I'm not sure why but this blog is loading very slow for me. Is anyone else having this issue or is it a problem on my end? I'll
check back later and see if the problem still exists.
Howdy! I'm at work browsing your blog from my new iphone! Just wanted to say I love reading your blog and look forward to all your posts! Carry on the great work!
Wow that was strange. I just wrote an really long comment but after I clicked submit my comment didn't
show up. Grrrr... well I'm not writing all that over again. Regardless, just wanted to say excellent blog!
my page Bradly
Add new comment