FreeOrion

Forums for the FreeOrion project
It is currently Wed Oct 18, 2017 12:21 am

All times are UTC




Post new topic Reply to topic  [ 3 posts ] 
Author Message
 Post subject: Wrong merged branches
PostPosted: Thu Sep 24, 2015 7:34 am 
Offline
Programmer
User avatar

Joined: Fri Mar 01, 2013 9:52 am
Posts: 1040
Location: Germany
The branches

* revert-281-add-more-way-to-specify-path-for-debug-handlers
* add_to_MSVC_project

should be part of master and not dangling around or be part or the 0.4.5 release branch, no?

_________________
Resident code gremlin
Attached patches are released under GPL 2.0 or later.
Git author: Marcel Metz


Top
 Profile  
 
PostPosted: Thu Sep 24, 2015 11:02 am 
Offline
Programming, Design, Admin
User avatar

Joined: Wed Oct 08, 2003 1:33 am
Posts: 11999
Location: Munich
The add to MSVC project was supposed to be created off of the branch from this pull request. If that branch was made off of the release branch, that might be the cause of the situation...? But it's not supposed to be merged with anything other than that branch anyway... Although something weird happened with it as I couldn't make a pull request to the Mitten-O's branch that I branch off of.


Top
 Profile  
 
PostPosted: Fri Sep 25, 2015 1:32 am 
Offline
AI Lead, Programmer
User avatar

Joined: Sat Sep 22, 2012 6:25 pm
Posts: 4369
adrian_broher wrote:
* revert-281-add-more-way-to-specify-path-for-debug-handlers
should be part of master and not dangling around or be part or the 0.4.5 release branch, no?
Forgot to clean that up before, sorry; it's deleted now.

_________________
If I provided any code, scripts or other content here, it's released under GPL 2.0 and CC-BY-SA 3.0


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

All times are UTC


Who is online

Users browsing this forum: No registered users and 1 guest


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® Forum Software © phpBB Group