Alexandru Pătrănescu <dreal...@gmail.com> writes: Hi Alexandru,
> I think you can just have a very simple script that > for each branchX in branchList > git checkout branchX > for each branchY in branchList > mergeResult = git merge branchY > if mergeResult > git reset HEAD~ > else > notify about conflict between branchX and branchY > git merge --abort That's a good starter, although I'd rather have a less precise solution which doesn't require that I've already done and committed my changes, i.e., I'd rather run the script *before* I start changing anything. So maybe something along these lines. for each $branchX in $ActiveBranches X = git diff HEAD..$branchX -- $FILE | grep '^[+-][^+-]' | wc -l C = $X * 100 / 2 / (cat $FILE | wc -l) echo "$FILE changed $C % on branch $branchX." I'll play with it when I find some time and post the results. Bye, Tassilo -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/git-users/87d00bdl7t.fsf%40gnu.org.
