Closed merqlove closed 10 years ago
I think you didn't rebase correctly. Maybe you did not git pull
my changes first?
Yes, i just made git fetch upstream && git pull --rebase upstream master
And after git rebase -i HEAD~13
(till Ignore .ruby-version and .ruby-gemset
)
I found solution. Wait a minute :)
Rebased from upstream master. Removed duplicate commit's. I don't understand why github adding your commits' into pool.