Wrong merged branches

Programmers discuss here anything related to FreeOrion programming. Primarily for the developers to discuss.

Moderator: Committer

Post Reply
Message
Author
User avatar
adrian_broher
Programmer
Posts: 1072
Joined: Fri Mar 01, 2013 9:52 am
Location: Germany

Wrong merged branches

#1 Post by adrian_broher » Thu Sep 24, 2015 7:34 am

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

User avatar
Geoff the Medio
Programming, Design, Admin
Posts: 12268
Joined: Wed Oct 08, 2003 1:33 am
Location: Munich

Re: Wrong merged branches

#2 Post by Geoff the Medio » Thu Sep 24, 2015 11:02 am

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.

User avatar
Dilvish
AI Lead, Programmer
Posts: 4712
Joined: Sat Sep 22, 2012 6:25 pm

Re: Wrong merged branches

#3 Post by Dilvish » Fri Sep 25, 2015 1:32 am

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

Post Reply