iOS，github，commit，push出现冲突问题，求大神指点迷津

/* Begin PBXBuildFile section */
0C5322561C45E3FE00872A1F /* AAAAlterPasswordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C5322551C45E3FE00872A1F /* AAAAlterPasswordViewController.m */; };
0C635C5E1C58AC4600FA288B /* backgirl.png in Resources */ = {isa = PBXBuildFile; fileRef = 0C635C5D1C58AC4600FA288B /* backgirl.png */; };
0C6B2A9D1C434AC900F0D866 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C6B2A9C1C434AC900F0D866 /* main.m */; };
0C6B2AA01C434AC900F0D866 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C6B2A9F1C434AC900F0D866 /* AppDelegate.m */; };
0C6B2AA81C434AC900F0D866 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0C6B2AA71C434AC900F0D866 /* Assets.xcassets */; };
0C6B2AAB1C434AC900F0D866 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0C6B2AA91C434AC900F0D866 /* LaunchScreen.storyboard */; };
0C6B2B411C435CA800F0D866 /* JuheApisSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C6B2B401C435CA800F0D866 /* JuheApisSDK.a */; };
0CBE20841C435FA500349FF0 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CBE20831C435FA500349FF0 /* UIKit.framework */; };
0CBE20861C435FB000349FF0 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CBE20851C435FB000349FF0 /* CoreGraphics.framework */; };
0CBE20881C435FB900349FF0 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CBE20871C435FB900349FF0 /* Foundation.framework */; };
0CBE208A1C435FC600349FF0 /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CBE20891C435FC600349FF0 /* MessageUI.framework */; };
0CBE208C1C435FD100349FF0 /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CBE208B1C435FD100349FF0 /* AdSupport.framework */; };
0CBE208E1C435FDE00349FF0 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CBE208D1C435FDE00349FF0 /* CoreLocation.framework */; };
0CBE20901C435FE800349FF0 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CBE208F1C435FE800349FF0 /* CoreTelephony.framework */; };
0CBE20921C435FF700349FF0 /* libicucore.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CBE20911C435FF700349FF0 /* libicucore.tbd */; };
0CBE20941C43600B00349FF0 /* libstdc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CBE20931C43600B00349FF0 /* libstdc++.tbd */; };
0CBE20961C43601700349FF0 /* libz.1.2.5.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CBE20951C43601700349FF0 /* libz.1.2.5.tbd */; };
0CBE20981C43602100349FF0 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CBE20971C43602100349FF0 /* libz.tbd */; };
0CBE209A1C43602B00349FF0 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CBE20991C43602B00349FF0 /* JavaScriptCore.framework */; };
0CBE209C1C43603700349FF0 /* AddressBook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CBE209B1C43603700349FF0 /* AddressBook.framework */; };
0CBE209E1C43604800349FF0 /* AddressBookUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CBE209D1C43604800349FF0 /* AddressBookUI.framework */; };
53CF86EBB5BB1CE13572A0A9 /* libPods-拉拉.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 315B50B7F9522F3918123266 /* libPods-拉拉.a */; };
6800AD821C4381CF006B756A /* AAASettingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6800AD7E1C4381CF006B756A /* AAASettingViewController.m */; };
6800AD831C4381CF006B756A /* setting.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6800AD801C4381CF006B756A /* setting.storyboard */; };
<<<<<<< HEAD
683FD7ED1C506ECA00A64129 /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 683FD7EC1C506ECA00A64129 /* MapKit.framework */; };
<<<<<<< HEAD:拉拉.xcodeproj/project.pbxproj
=======
683FD7F01C508ACB00A64129 /* AAALoginResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 683FD7EF1C508ACB00A64129 /* AAALoginResult.m */; };
685098721C55AAFD0097DBA1 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 685098711C55AAFD0097DBA1 /* [email protected] */; };
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
68262AD21C53611C0079DA5B /* CDatePickerViewEx.m in Sources */ = {isa = PBXBuildFile; fileRef = 68262AD11C53611C0079DA5B /* CDatePickerViewEx.m */; };
68262AD41C5361900079DA5B /* bg.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 68262AD31C5361900079DA5B /* bg.jpg */; };
68262AD61C5362070079DA5B /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 68262AD51C5362070079DA5B /* [email protected] */; };
683FD7ED1C506ECA00A64129 /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 683FD7EC1C506ECA00A64129 /* MapKit.framework */; };
683FD7F01C508ACB00A64129 /* AAALoginResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 683FD7EF1C508ACB00A64129 /* AAALoginResult.m */; };
6852903E1C4F108100A78405 /* NaviController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6852903D1C4F108100A78405 /* NaviController.m */; };
685290641C4F3C4100A78405 /* MealRecondViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 685290631C4F3C4100A78405 /* MealRecondViewController.m */; };
685290681C4F3CC400A78405 /* Special2Cell.m in Sources */ = {isa = PBXBuildFile; fileRef = 685290671C4F3CC400A78405 /* Special2Cell.m */; };
6852906C1C4F3CD000A78405 /* SpecialCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 6852906B1C4F3CD000A78405 /* SpecialCell.m */; };
685290701C4F3CD900A78405 /* RewardCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 6852906F1C4F3CD900A78405 /* RewardCell.m */; };
685290741C4F3CE000A78405 /* LeaveCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 685290731C4F3CE000A78405 /* LeaveCell.m */; };
685290781C4F3D0800A78405 /* MealCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 685290771C4F3D0800A78405 /* MealCell.m */; };
685290A81C4F6D7300A78405 /* OverTAndCons.m in Sources */ = {isa = PBXBuildFile; fileRef = 685290A71C4F6D7300A78405 /* OverTAndCons.m */; };
685290AB1C4F6E9800A78405 /* TimeAndConsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 685290AA1C4F6E9800A78405 /* TimeAndConsViewController.m */; };
685290AF1C4F733D00A78405 /* ConsumeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 685290AE1C4F733D00A78405 /* ConsumeViewController.m */; };
685290B31C4F7B0100A78405 /* ChargeCardCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 685290B21C4F7B0100A78405 /* ChargeCardCell.m */; };
685290B61C4F7B7800A78405 /* ChargeCardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 685290B51C4F7B7800A78405 /* ChargeCardViewController.m */; };
685290BA1C4F80F000A78405 /* PunchCardCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 685290B91C4F80F000A78405 /* PunchCardCell.m */; };
685290BD1C4F81F000A78405 /* PunchCardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 685290BC1C4F81F000A78405 /* PunchCardViewController.m */; };
>>>>>>> origin/HYDeFeng
>>>>>>> origin/HYDeFeng
>>>>>>> origin/HYDeFeng
685291401C4FB4CF00A78405 /* AAALoginAndRegionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6852913E1C4FB4CF00A78405 /* AAALoginAndRegionViewController.m */; };

>>>>>>> origin/HYDeFeng:N+.xcodeproj/project.pbxproj
6852914A1C4FB4E500A78405 /* QRCameraSwitchButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 685291441C4FB4E500A78405 /* QRCameraSwitchButton.m */; };

解决方案 »

  1.   

    求大神指导，怎么消除github上的冲突问题，感激不尽
      

  2.   

    为什么不用svn   代码本地  局域网速度快  git断网就没了 网速慢也更新慢啊
      

  3.   

    把那个什么head什么的都给删除了就好了
      

  4.   

    能具体指出要去掉的范围么？现在想先学会github的代码管理，毕竟是新人
      

  5.   

    正常的话用搜索，把带<<<<<<<<<<<<或者>>>>>>>>>>>>>或者============关键字的行都删除，还是不行的话就找到上个好用的版本，拷贝一个product文件
      

  6.   

    出现这个问题就是代码冲突了, 你要看清是要你自己的代码还是留别人的代码.
    出现<<<<和>>>的一个是自己的代码 一个是别人的代码  视实际情况而定