.icon {
  font-family: "iconfont" !important;
  font-style: normal;
  display: inline-block;
  vertical-align: middle;
  background-size: 100% auto;
  background-position: center;
  -webkit-font-smoothing: asntialiased;
  -webkit-text-stroke-width: 0.2px;
  -moz-osx-font-smoothing: grayscale;
}

There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details

    git pull <remote> <branch>

If you wish to set tracking information for this branch you can do so with:

    git branch --set-upstream-to=origin/<branch> develop_hotfix

fatal: unable to access 'https://github.com/YooHannah/WeiXindemo.git/': Failed to connect to github.com port 443: Timed out

error:src refspec master does not match any

If no other git process is currently running, this probably means a
git process crashed in this repository earlier. Make sure no other git
process is running and remove the file manually to continue.

1.在主分支host上取消第二次提交
git reset --hard HEAD~1

2.将远端第二次提交撤销掉,让分支保留在B同学提交的状态
git push --force

3.切换本地分支local,回滚版本到两次提交前
git reset HEAD^^ 

4.保存两次提交 可以通过git stash list查看保存状态
git stash 
git stash list

5. 合并主分的B同学的提交到本地分支local,这时本地分支就有B同学的代码变更了
6. 取出A同学的两次提交,与B同学代码进行提交
git stash pop
7. 切换主分支host,合并本地分支local,推送到远端

html:
<div ng-repeat="item in labels track by $index" style="padding-left: 50px">
  <label class="mt-checkbox mt-checkbox-single mt-checkbox-outline" ><input  type="checkbox" ng-model="item.isSelected" ng-click="updateSingelSelection($index,labels)" /><span></span></label>
  <label>{{item.name}}</label>
</div>

<div class="portlet-body dataTables_wrapper" style="margin: -20px 20px 0px 20px;" ng-if="detaildata.goods.length>0">
	<div class="table-scrollable">
		<table class="table table-bordered table-hover no-footer">
			<thead>
				<tr role="row" class="heading">
					<th>ID</th>
					<th>
						<label class="mt-checkbox mt-checkbox-single mt-checkbox-outline"><input type="checkbox" ng-model="detaildata.goods.allchecked" ng-change="selectall()"/><span></span></label>
					</th>
				</tr>
			</thead>
			<tbody>
				<tr role="row" ng-repeat="item in detaildata.goods track by $index">
					<td>{{item.id}}</td>
					<td>
						<label class="mt-checkbox mt-checkbox-single mt-checkbox-outline"><input  type="checkbox" ng-model="item.checked" ng-click="UpdateSelection($index)"/><span></span></label>
					</td>
				</tr>
			</tbody>
		</table>
	</div>
</div>

 $scope.UpdateSelection = function(index){
    if($scope.detaildata.goods[index].checked){

      tempdata2.push($scope.detaildata.goods[index]); 					//处理选中项

      if(tempdata2.length == $scope.detaildata.goods.length){   //判断是否满足全选条件，						$scope.detaildata.goods.allchecked = true;                //满足则将全选按钮设置为勾选状态
      }else{
        $scope.detaildata.goods.allchecked = false;             //否则为未选状态
      }
    } else {
      $scope.alldata.goods[index].checked = false; //全选按钮设为
      angular.forEach(tempdata2, function(list,num){
        if($scope.detaildata.goods[index].deal_id == list.deal_id){
         tempdata2.splice(num,1);
         $scope.detaildata.goods.allchecked = false;
         return;
       }
     });

    }
}

$scope.selectall = function(){
 if($scope.detaildata.goods.allchecked){
  for(var i = 0;i < $scope.detaildata.goods.length;i++){
    $scope.detaildata.goods[i].checked = true;       //把每个备选项处理为已选状态
    var num = 0;
    for(var j = 0;j < tempdata2.length;j++){
      if($scope.detaildata.goods[i].deal_id != tempdata2[j].deal_id){
        num = num+1;
      }else{
        num = num;
      }
    }
    if(num == tempdata2.length){
      tempdata2.push($scope.detaildata.goods[i]); //将所有为选择的数据处理到临时集合
    }
  }
}else{
  for(var i = 0;i < $scope.detaildata.goods.length;i++){
    $scope.detaildata.goods[i].checked = false; //把每个备选项处理为未选状态
  }
  tempdata2 = []; //清空临时集合
}
}

//表格勾选 tempdata勾选数据集合，data所有待选数据集合，status勾选状态，keyword数据标志属性
APP.factory('selectAll', function(){
    //全选按钮的勾选
  var allChoose = function (tempdata,data,status,keyword1,keyword2) {
        if(status){
            for(var i = 0;i < data.length;i++){
              data[i].isSelected = true;       //把每个备选项处理为已选状态
              var num = 0;
              for(var j = 0;j < tempdata.length;j++){
                if(data[i][keyword1] != tempdata[j][keyword2]){
                  num = num+1;
                }else{
                  num = num;
                }
              }
              if(num == tempdata.length){
                tempdata.push(data[i]); //将所有未选择的数据处理到临时集合
              }
            }
          }else{
            for(var i = 0;i < data.length;i++){
              data[i].isSelected = false; //把每个备选项处理为未选状态
               angular.forEach(tempdata, function(item,num){
                if(data[i][keyword1] == item[keyword2]){
                tempdata.splice(num,1);
               }
             });
            }
          }
      return {
        'tempdata':tempdata,
        'data':data
       };
  };

  //检查是否满足全选
  var checkAll = function (tempdata,data,keyword1,keyword2) {
       var temp =0;
        angular.forEach(data, function(item){
          item.isSelected = false;
          angular.forEach(tempdata, function(term){
            if(item[keyword1] == term[keyword2]){
              item.isSelected = true;
              temp +=1;
            }
          });
        });
        if(temp == data.length){
          return {
            'allChecked':true,
            'data':data,
            'tempdata':tempdata
           };
        }else{
          return {
            'allChecked':false,
            'data':data,
            'tempdata':tempdata
          };
       }
  };

  //单项勾选
  var UpdateSelection = function(tempdata,data,index,keyword1,keyword2){
     if(data[index].isSelected){ //添加选中
            tempdata.push(data[index]);
          }else{
            angular.forEach(tempdata, function(item,num){
              if(data[index][keyword1] == item[keyword2]){
               tempdata.splice(num,1);
             }
           });
          }
     return checkAll(tempdata,data,keyword1,keyword2)
  };

  //众多选项单选
  var singleSelection = function (choseindex,data) {
      angular.forEach(data, function(x, index) {
          if (choseindex != index)
            x.isSelected = false;
        });
      return data;
  };

  return {
    'allChoose': allChoose,
    'checkAll':checkAll,
    'UpdateSelection':UpdateSelection,
    'singleSelection':singleSelection
  };
})

<a  class="font-green-meadow clicopy" data-clipboard-text="{{x.scan_url}}" ><i class="fa fa-copy"></i> 复制扫描链接</a>