07.04.2013 14:45, Yves Blusseau пишет: > Le 7 avr. 2013 à 12:33, KP Kirchdoerfer <kap...@users.sourceforge.net> a > écrit : > >> Someting might went wrong when rebasing, I had to hard reset my local >> repository to origin/rpi, cause pull and reabse gave resulted in errors. > Yes because rebase is bad for branch already committed. > Rebase rewrite the history so you have to do a git pull -f > It's better to merge master in rpi > > Yves If we'll merge this branch into master in future - is it OK to merge master into rpi branch?
------------------------------------------------------------------------------ Minimize network downtime and maximize team effectiveness. Reduce network management and security costs.Learn how to hire the most talented Cisco Certified professionals. Visit the Employer Resources Portal http://www.cisco.com/web/learning/employer_resources/index.html _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
