Git merge not pushing all merged files?
Maybe I am doing something wrong but I am using git svn, and I do the following commands
git checkout master git merge clean git svn dcommit
The merge goes fine, deleting tons of files, merging files, adding files, but the git svn dcommit doesn't push all the files. I then do a git svn rebase to make sure were all up to speed, find and fix some conflicts and then commit and push again and I only see the files that were changed in the conflict getting pushed.
In git you should do rebase instead of merge to have linear history, then you could dcommit it into svn.