[fixed] [JIRA MP1-2469] - DetectDrive method obsolete ? (5 Viewers)

[Deda]

I merged current master and resolved conflict in branch.

 

[Deda]

Probably will be the best to reset branch to master than copy back changed files and push in branch, now it's not so easy to see changes

Changed/new files:

TvEngine3\TVLibrary\TvPlugin\TvPlugin\TvPlugin.csproj
mediaportal\Core\Core.csproj
mediaportal\Core\Util\Util.cs
mediaportal\Core\Util\VirtualDirectory.cs
mediaportal\Core\Util\WmiExtensions.cs
mediaportal\MediaPortal.Application\MediaPortal.cs
mediaportal\WindowPlugins\GUIMusic\GUIMusicFiles.cs
mediaportal\WindowPlugins\GUIPictures\GUIPictures.cs
mediaportal\WindowPlugins\GUIVideoFiles\GUIVideoFiles.cs

Seb do you know clean method to do that ?

 

[elliottmc]

Easier to create a new branch with a slightly different name, and delete the existing one?

 

[Deda]

Dunno, maybe @Sebastiii knows better method . I uploaded changed files just in case (just don't forget to add mediaportal\Core\Util\WmiExtensions.cs to GIT before commit)

 

[Sebastiii]

Ok

It's done, i have force/rebase the branch (same name) based on current Master + Deda's files
Thanks

 

[azzuro]

and link with jira for review ?
Done

 

[elliottmc]

Seb

There still seems to be a conflict reported when I merge to master locally, although it actually looks fine when I try to resolve the conflict.

 

[Sebastiii]

That's strange, i will give a try but it was based on master + files so it should be good.

I have rebase the github branch, so maybe you need to fetch your local repo again to take new one ? (you surely already did that lol)

 

[elliottmc]

I have rebase the github branch, so maybe you need to fetch your local repo again to take new one ? (you surely already did that lol)

Yes!

 

[elliottmc]

Tried again, and fine now.