无法使用git pull进行分支

时间:2015-08-06 11:45:32

标签: git git-flow

当我尝试执行git pull时,我从git中收到此错误消息:

<?xml version="1.0" encoding="utf-8" ?>
<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
             x:Class="XilnexOTM.Views.LoginPage">

    <AbsoluteLayout VerticalOptions="FillAndExpand"
                    HorizontalOptions="FillAndExpand">

        <Image AbsoluteLayout.LayoutFlags="All" AbsoluteLayout.LayoutBounds="0, 0, 1, 1"
            Source="bg1.png" Aspect="AspectFill"/>

        <ScrollView AbsoluteLayout.LayoutFlags="All" AbsoluteLayout.LayoutBounds="0, 0, 1, 1">
            <StackLayout Orientation="Vertical">
                <Label Text="PICTURE"  />
                <Label Text="PIC 2" />

                <Entry Placeholder="Username" />
                <Entry Placeholder="Password" IsPassword="true"/>

                <Button x:Name="btn_Login"
                        Text="Login"
                        BackgroundColor="#FF0000"/>
            </StackLayout>
        </ScrollView>                   

    </AbsoluteLayout>             
</ContentPage>

如何解决错误?

1 个答案:

答案 0 :(得分:2)

你可以:

git pull origin <your_branch>

为了防止这种情况发生,请在按下时使用-u

  

设置<branchname>'s跟踪信息,以便考虑<upstream>   <branchname>'s上游分支。如果未指定<branchname>,则默认为当前分支。

它只是告诉git当它试图拉动该分支时的位置。