我正在开发一个分支 SystemMediaTransportControls systemControls;
void Alfa4c_Click(object sender, RoutedEventArgs e)
{
// get folder app is installed to
var installFolder = Windows.ApplicationModel.Package.Current.InstalledLocation;
// get folders mp3 files are installed to.
var resourcesFolder = await installFolder.GetFolderAsync("Audio");
// open the mp3 file async
var audioFile = await mp3FilesFolder.GetFileAsync("Alfa4c.mp3");
var stream = await audioFile.OpenAsync(Windows.Storage.FileAccessMode.Read);
// play dat funky music
MediaElement mediaplayer = new MediaElement();
mediaplayer.SetSource(stream, audioFile.ContentType);
mediaplayer.Play();
}
的功能分支logs。
分支已被推送到远程github。
它在那里坐了一会儿，我最近要做一些修改，所以我重新取决于主人，这很好，做了我的新提交，但是当我试图推动我得到：
master和 -
Updates were rejected because the tip of your current branch is behind
git是否因为我重新定位而感到不安？如果我执行git pull和merge，它是一个空提交，我该如何避免这个？