From 3172a6ac39d98383451e8b36cd33d291347fc93b Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Fri, 6 Nov 2015 14:06:29 +0100 Subject: [PATCH] * admin/notes/repo: Fix a few obsolete references to Bazaar --- admin/notes/repo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/notes/repo b/admin/notes/repo index b27a3f42891..3ab3da78071 100644 --- a/admin/notes/repo +++ b/admin/notes/repo @@ -41,8 +41,8 @@ preferable not to merge from master until you are done with the feature. Unless you really need some change that was done on the master while you were developing on the branch, you don't really need those merges; just merge once, when you are done with the feature, and -Bazaar will take care of the rest. Bazaar is much better in this than -CVS, so interim merges are unnecessary. +Git will take care of the rest. Git is much better in this than CVS, +so interim merges are unnecessary. Or use shelves; or rebase; or do something else. See the thread for yet another fun excursion into the exciting world of version control. -- 2.39.5