1、本地与远程各有一个同名的feature-data分支
2、在本地的feature-data分支上做了修改之后,将本地的feature-data合并到远程同名的feature-data上;
(注:最好只单独合并修改的那几个文件,不用合并整个分支)如下:
//创建一个临时分支feature-data_tmp,并切换到feature-data_tmp,用于备份feature-data
git checkout -b feature-data_tmp;
//在当前feature-data_tmp下合并feature-data
git merge feature-data;
//切换回feature-data
git checkout feature-data;
//拉取远程的feature-data到本地的feature-data,将其覆盖
git pull origin feature-data;
//再次创建一个临时分支feature-data_tmp2,并切换到feature-data_tmp2
git checkout -b feature-data_tmp2;
//将feature-data_tmp下单独修改过的文件依次合并到当前分支feature-data_tmp2(也可使用脚本);
git checkout feature-data_tmp ./......./xxx1.java;
git checkout feature-data_tmp ./......./xxx2.java;
....................
//所有文件合并完后,进行提交
git commit -ma "提交信息";
//切换回feature-data
git checkout feature-data;
//一并将feature-data_tmp2合并到当前feature-data分支
git merge feature-data_tmp2;
//最后feature-data就是最新的分支,将本地的feature-data推到远程的feature-data
git push feature-data;