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.

ideas?

Answers


In git you should do rebase instead of merge to have linear history, then you could dcommit it into svn.


Need Your Help

Cannot ping google.com from Ubuntu terminal behind a proxy server

ubuntu proxy ping proxy-server

I am connected to the internet through a proxy server. I am using an Ubuntu installation and have made the appropriate network setting changes including in the files /etc/bash.bashrc and

Why is field value not displaying for first record in Rails?

ruby-on-rails ruby-on-rails-3.1

I have the following code that should show the value for the display field in my view:

About UNIX Resources Network

Original, collect and organize Developers related documents, information and materials, contains jQuery, Html, CSS, MySQL, .NET, ASP.NET, SQL, objective-c, iPhone, Ruby on Rails, C, SQL Server, Ruby, Arrays, Regex, ASP.NET MVC, WPF, XML, Ajax, DataBase, and so on.