[sr-dev] git merge

Raúl Alexis Betancor Santana rabs at dimension-virtual.com
Tue Jul 7 20:07:22 CEST 2009


Before doing a dissaster .. :-P

How should I merge the rbentancor/drouting branch into the master branch 
taking into account that master branch have changes I do not have on drouting 
branch.

There are not possible conflicts, because I only worked on the drouting 
module, anything more.

-- 
Raúl Alexis Betancor Santana
Dimensión Virtual



More information about the sr-dev mailing list