On Jun 09, 2010 at 15:26, Juha Heinanen <[email protected]> wrote: > Andrei Pelinescu-Onciul writes: > > > I've restored it and it should work now. > > andrei, > > yes, thanks, now push to master worked, but when i switched to k branch > and did pull, i got new errors: > > $ eg switch kamailio_3.0 > Switched to branch 'kamailio_3.0' > Your branch and 'origin/kamailio_3.0' have diverged, > and have 1 and 3 different commit(s) each, respectively. > $ eg pull > [email protected]'s password: > Removing pkg/kamailio/debian-etch/patches/00list > Removing pkg/kamailio/debian-etch/patches/10_no_lib64_on_64_bits.dpatch > Removing pkg/kamailio/debian-etch/patches/11_always_smp.dpatch > CONFLICT (directory/file): There is a directory with name > pkg/kamailio/debian-lenny in HEAD. Adding pkg/kamailio/debian-lenny as > pkg/kamailio/debian-lenny~3224810f6fc75b0f7a498e8bfe3947c0e05bc98f > Removing pkg/kamailio/debian-lenny/changelog > Removing pkg/kamailio/debian-lenny/rules > Automatic merge failed; fix conflicts and then commit the result.
I don't know what eg does, but (after making a quick backup of the tree), try the following: # revert to the state before the pull/merge # (warning: any not comited changes will be permanently lost, that's # the main reason for the backup) git reset --hard ORIG_HEAD # if everything is ok (your commit should be ontop) # rebase on top of the repository version of kamailio_3.0 git rebase origin/kamailio_3.0 # push your changes back git push origin kamailio_3.0:kamilio_3.0 If you still got errors, try again git reset --hard ORIG_HEAD, delete pkg/kamailio/debian-lenny and then continue with the rebase. If it still doesn't work, reset --hard ORIG_HEAD again, and send me the output of: git log ^HEAD origin/kamailio_3.0 git log HEAD ^origin/kamailio_3.0 git diff git diff --cached git status Andrei _______________________________________________ sr-dev mailing list [email protected] http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
