From mboxrd@z Thu Jan 1 00:00:00 1970 From: FernandoBasso Subject: Really beginner on Version Control Date: Tue, 21 Sep 2010 07:42:13 -0700 (PDT) Message-ID: <1285080133451-5555023.post@n2.nabble.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Sep 21 16:42:23 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Oy433-0001KH-LT for gcvg-git-2@lo.gmane.org; Tue, 21 Sep 2010 16:42:22 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755808Ab0IUOmO (ORCPT ); Tue, 21 Sep 2010 10:42:14 -0400 Received: from kuber.nabble.com ([216.139.236.158]:59876 "EHLO kuber.nabble.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754185Ab0IUOmO (ORCPT ); Tue, 21 Sep 2010 10:42:14 -0400 Received: from jim.nabble.com ([192.168.236.80]) by kuber.nabble.com with esmtp (Exim 4.63) (envelope-from ) id 1Oy42v-0002cW-LU for git@vger.kernel.org; Tue, 21 Sep 2010 07:42:13 -0700 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: I am really a beginner in. Bear with me please. Why do we merge, say a testing branch into the master branch ? What is the use of it ? When there is a conflict when merging branches (merging the testing into the current branch), should I edit the 'current' branch or the 'testing' branch ? Should both branches have exactly the same code so that they can be merged without conflicts ? -- View this message in context: http://git.661346.n2.nabble.com/Really-beginner-on-Version-Control-tp5555023p5555023.html Sent from the git mailing list archive at Nabble.com.