home
products
contribute
download
documentation
forum
Home
Forums
New posts
Search forums
What's new
New posts
All posts
Latest activity
Members
Registered members
Current visitors
Donate
Log in
Register
What's new
Search
Search
Search titles only
By:
New posts
Search forums
Search titles only
By:
Menu
Log in
Register
Navigation
Install the app
Install
More options
Contact us
Close Menu
Forums
MediaPortal 1
Development
General Development (no feature request here!)
Custom Data Grabber including Sky UK Channel/EPG Grabber
Contact us
RSS
JavaScript is disabled. For a better experience, please enable JavaScript in your browser before proceeding.
You are using an out of date browser. It may not display this or other websites correctly.
You should upgrade or use an
alternative browser
.
Reply to thread
Message
<blockquote data-quote="ears" data-source="post: 1089757" data-attributes="member: 83203"><p>Thanks Benoire I've had a go but know I've done it wrong.</p><p></p><p>I think I know what I want to do - merge 1.7.1 custom grabber branch into 1.8.0 but I just can't work out how to do it in TortoiseGit or in the Altassian software you recommended.</p><p></p><p>I've tried something but it's almost certainly gone wrong and even if it's gone right I don't know what I've done.</p><p></p><p>Do I grab / download 1.8.0 then merge and select 1.7.1 exp custom, or grav 1.7.1 exp custom and merge to 1.8.0? In my experience of TFS I'd say the latter - that's what I tried but I don't think it went well.</p><p></p><p>Any guidance gratefully receieved. It seems like there are 2 small conflicts in SQL update scripts but easily resolved.</p></blockquote><p></p>
[QUOTE="ears, post: 1089757, member: 83203"] Thanks Benoire I've had a go but know I've done it wrong. I think I know what I want to do - merge 1.7.1 custom grabber branch into 1.8.0 but I just can't work out how to do it in TortoiseGit or in the Altassian software you recommended. I've tried something but it's almost certainly gone wrong and even if it's gone right I don't know what I've done. Do I grab / download 1.8.0 then merge and select 1.7.1 exp custom, or grav 1.7.1 exp custom and merge to 1.8.0? In my experience of TFS I'd say the latter - that's what I tried but I don't think it went well. Any guidance gratefully receieved. It seems like there are 2 small conflicts in SQL update scripts but easily resolved. [/QUOTE]
Insert quotes…
Verification
Post reply
Forums
MediaPortal 1
Development
General Development (no feature request here!)
Custom Data Grabber including Sky UK Channel/EPG Grabber
Contact us
RSS
Top
Bottom
