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!)
Experimental TsReader development
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="disaster123" data-source="post: 851021" data-attributes="member: 74707"><p><a href="https://forum.team-mediaportal.com/members/owlsroost.83973/" target="_blank">Owlsroost</a></p><p>what have you done with your branch? ;-) I wanted to merge it again into my local branch but it totally breaks my branch</p><p></p><p>Problem is this one:</p><p>"</p><p>commit dc29fef0c739315f87e1dd6196ccce1242ac8a1c</p><p>Merge: 6b19eaf b016657</p><p>Author: owlsroost <<a href="mailto:tony@owlsroost.org.uk">tony@owlsroost.org.uk</a>></p><p>Date: Fri Mar 2 23:26:00 2012 +0000</p><p>:</p><p> After merge and revert.....aagh</p><p>"</p><p></p><p>could you please do a hard reset and then a non forward push or something like that?</p></blockquote><p></p>
[QUOTE="disaster123, post: 851021, member: 74707"] [URL='https://forum.team-mediaportal.com/members/owlsroost.83973/']Owlsroost[/URL] what have you done with your branch? ;-) I wanted to merge it again into my local branch but it totally breaks my branch Problem is this one: " commit dc29fef0c739315f87e1dd6196ccce1242ac8a1c Merge: 6b19eaf b016657 Author: owlsroost <[email]tony@owlsroost.org.uk[/email]> Date: Fri Mar 2 23:26:00 2012 +0000 : After merge and revert.....aagh " could you please do a hard reset and then a non forward push or something like that? [/QUOTE]
Insert quotes…
Verification
Post reply
Forums
MediaPortal 1
Development
General Development (no feature request here!)
Experimental TsReader development
Contact us
RSS
Top
Bottom
