I tried to merge 2 branches, but there are so much file difference (more 
hundred files), that I can not merge them in one step.

I create a diff file containing different files between branch dev & 
git diff dev..local/dev --name-only >diff_dev+local-dev_files.txt
Removed HEAD from the list, and now I have a good list of different files.

I should group them somehow and commit the changes by group.

I can imagine a solution:
Checkout files listed in diff_dev+local-dev_files.txt from "local_dev" to 
"dev" branch.
This way I could stash them, and commit by selected groups.

My problem is, that I can not see possibility to checkout files from 
another branch, based on a filelist from a text file.

Other idea how to solve this problem?


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.
For more options, visit https://groups.google.com/d/optout.

Reply via email to