git将一个分支合入到另一个分支
将分支a合入到分支b
1.首先需要切到分支b，然后pull一下，使b分支代码与远程b分支代码一致；准备就绪，在b分支下创建一个新的分支async/a-to-b
// 创建并cd到新分支上
git checkout -b async/a-to-b

2.实行merge将远程分支amerge到本地新分支上
git merge origin/a

3.你可以通过vscode去解决代码上的冲突
// vscode上解决冲突
// 解决冲突按各自喜欢

4.加入本地缓存
git add .

5.再次merge，看下冲突是否解决完，控制台有标识，此处不再截图
git merge origin/a

6.修改提交记录
git commit --amend

7.推代码
git push origin async/a-to-b -f

 将几张图片合成为一个视频,是我在网址找到的方法做成了一个Demo,分享给大家
一、代码
    // 初始化压缩引擎
    AVAssetWriter *videoWriter = [[AVAssetWriter alloc] initWithURL:[NSURL fileURLWithPath:self.moviePath] fileType:AVFileTypeQuickTimeMovie error:&error];
    // 设置生成的视频的参数,尺寸和编码格式
    NSDictionary *videoSetting = [NSDictionary dictionaryWithObjectsAndKeys:AVVideoCodecH264,AVVideoCodecKey,[NSNumber numberWithInt:movieSize.width],AVVideoWidthKey,[NSNumber numberWithInt:movieSize.height],AVVideoHeightKey, nil];
    // 将多张图片合成为一个视频文件的主体代码
    dispatch_queue_t queue = dispatch_queue_create("mediaInputQueue", NULL);
    int __block frame = 0;

    [writerInput requestMediaDataWhenReadyOnQueue:queue usingBlock:^{
        
        while ([writerInput isReadyForMoreMediaData]) {
            if(++frame >= [self.imageArr count] * 10){
                [writerInput markAsFinished];
                [videoWriter finishWritingWithCompletionHandler:^{
                    
                    NSLog(@"结束了");
                    
                }];
                break;
            }
            
            CVPixelBufferRef buffer = NULL;
            // 和下面的CMTimeMake(frame, 5)一起控制视频的长度,和上面的 [self.imageArr count] * 10 中的10 是一个
            int idx = frame / 10;
            
            NSLog(@"idx == %d",idx);
            
            buffer = [self pixelBufferFromCGImage:[[self.imageArr objectAtIndex:idx] CGImage] size:movieSize];
            
            if(buffer){
                // 将获得的视频段添加到一起
                if([adaptor appendPixelBuffer:buffer withPresentationTime:CMTimeMake(frame, 5)]){
                    NSLog(@"写入成功");
                }
                else{
                    NSLog(@"写入失败");
                    CFRelease(buffer);
                }
            }
        }
    }];
    // 把CGImageRef格式转换为CVPixelBufferRef格式
- (CVPixelBufferRef)pixelBufferFromCGImage:(CGImageRef)image size:(CGSize)size
二、工程地址
工程地址

 示例：两个bean，一个汇总bean

@Data
public class RepaymentPlanUserDTO implements Serializable {


/**
 * 当前期数
 **/
private Integer period;

/**
 * 应还日期 按账单生成规则进行生成，格式：yyyy-mm-dd hh:mm:ss（默认零点）
 **/
private LocalDateTime shouldRepayTime;

/**
 * 应还总额
 **/
private BigDecimal shouldRepayTotal;

}

@Data
public class CashPreRepayInfoDTO implements Serializable {


    /**
     * 提前结清应付金额
     */
    private BigDecimal clearanceAmount;

    /**
     * 期数
     */
    private Integer periodNum;

}

@Data
@AllArgsConstructor
@NoArgsConstructor
public class RepaymentPlanTrialDTO implements Serializable {

    /**
     * 当前期数
     */
    private Integer period;
    /**
     * 应还日
     */
    private LocalDate shouldRepayDate;
    /**
     * 每期应还金额
     */
    private BigDecimal shouldRepayAmount;
    /**
     * 提前结清金额
     */
    private BigDecimal preClearAmount;
}

//构建两个list

List<RepaymentPlanUserDTO> udtos = new ArrayList<>();
RepaymentPlanUserDTO r1 = new RepaymentPlanUserDTO();
r1.setPeriod(1);
r1.setShouldRepayTotal(BigDecimal.ONE);
r1.setShouldRepayTime(LocalDateTime.now());
RepaymentPlanUserDTO r2 = new RepaymentPlanUserDTO();
r2.setPeriod(2);
r2.setShouldRepayTotal(BigDecimal.valueOf(2));
r2.setShouldRepayTime(LocalDateTime.now().plusDays(2));
RepaymentPlanUserDTO r3 = new RepaymentPlanUserDTO();
r3.setPeriod(3);
r3.setShouldRepayTotal(BigDecimal.valueOf(3));
r3.setShouldRepayTime(LocalDateTime.now().plusDays(3));
final List<CashPreRepayInfoDTO> pdtos = new ArrayList<>();
CashPreRepayInfoDTO c1 = new CashPreRepayInfoDTO();
c1.setPeriodNum(1);
c1.setClearanceAmount(BigDecimal.valueOf(11));
CashPreRepayInfoDTO c2 = new CashPreRepayInfoDTO();
c2.setPeriodNum(2);
c2.setClearanceAmount(BigDecimal.valueOf(12));
CashPreRepayInfoDTO c3 = new CashPreRepayInfoDTO();
c3.setPeriodNum(3);
c3.setClearanceAmount(BigDecimal.valueOf(13));
pdtos.addAll(Arrays.asList(c1,c2,c3));
udtos.addAll(Arrays.asList(r1,r2,r3));

//根据period合并两个bean

List<RepaymentPlanTrialDTO> list = udtos.stream().flatMap(x -> pdtos.stream().filter(y -> x.getPeriod().intValue() == y.getPeriodNum()).map(z -> new RepaymentPlanTrialDTO(x.getPeriod(), x.getShouldRepayTime().toLocalDate(), x.getShouldRepayTotal(), z.getClearanceAmount()))).collect(Collectors.toList());



List<RepaymentPlanTrialDTO> list = udtos.stream().flatMap(x -> pdtos.stream().filter(y -> x.getPeriod().intValue() == y.getPeriodNum()).map(z -> new RepaymentPlanTrialDTO(x.getPeriod(), x.getShouldRepayTime().toLocalDate(), x.getShouldRepayTotal(), z.getClearanceAmount()))).collect(Collectors.toList());


//输出

RepaymentPlanTrialDTO(period=1, shouldRepayDate=2019-07-02, shouldRepayAmount=1, preClearAmount=11)

RepaymentPlanTrialDTO(period=2, shouldRepayDate=2019-07-04, shouldRepayAmount=2, preClearAmount=12)

RepaymentPlanTrialDTO(period=3, shouldRepayDate=2019-07-05, shouldRepayAmount=3, preClearAmount=13)

 

 

 

将add、commit、push 三个命令合为一个：
git config --global alias.cmp '!f() { git add -A && git commit -m "$@" && git push; }; f'
使用时只需要 git cmp "内容"

由此可知若想讲add、commit两个命令合为一个只需要输入下面的命令
git config --global alias.cm '!f() { git add -A && git commit -m "$@"; }; f'
注：cm与cmp可以自定义