From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bill Wohler Newsgroups: gmane.emacs.devel Subject: Re: need help adjusting workflow to git (or vice versa) Date: Sun, 16 Nov 2014 10:57:31 -0800 Organization: Newt Software Message-ID: <874mtz0y90.fsf@olgas.newt.com> References: <87zjbvt8o3.fsf@rosalinde.fritz.box> <5464DC5F.8070607@gmx.at> <87oasaubfc.fsf@rosalinde.fritz.box> <54651045.6080901@cs.ucla.edu> <87k32yu8yh.fsf@rosalinde.fritz.box> <83egt6jqtg.fsf@gnu.org> <87lhncayq4.fsf@rosalinde.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416164289 31398 80.91.229.3 (16 Nov 2014 18:58:09 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 16 Nov 2014 18:58:09 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 16 19:58:04 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Xq51Q-0007BE-Aq for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 19:58:04 +0100 Original-Received: from localhost ([::1]:44772 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq51Q-0004Yk-0i for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 13:58:04 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45563) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq51A-0004Ww-GB for emacs-devel@gnu.org; Sun, 16 Nov 2014 13:57:52 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xq516-0003qA-6R for emacs-devel@gnu.org; Sun, 16 Nov 2014 13:57:48 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:32944) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq515-0003q4-W3 for emacs-devel@gnu.org; Sun, 16 Nov 2014 13:57:44 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Xq514-00073T-4j for emacs-devel@gnu.org; Sun, 16 Nov 2014 19:57:42 +0100 Original-Received: from c-24-6-53-16.hsd1.ca.comcast.net ([24.6.53.16]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 16 Nov 2014 19:57:42 +0100 Original-Received: from wohler by c-24-6-53-16.hsd1.ca.comcast.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 16 Nov 2014 19:57:42 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 20 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: c-24-6-53-16.hsd1.ca.comcast.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.93 (gnu/linux) Cancel-Lock: sha1:Zo9LMg3kkI/f8aN2kpywY7zFRps= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:177343 Archived-At: Stephen Berman writes: > On Fri, 14 Nov 2014 07:26:19 +0200 Eli Zaretskii wrote: > >> Every VCS has its downsides. Bzr had only separate branches >> (co-located branches were initially implemented in the last version); >> git has only co-located branches. You need to work around that. > > Yes, there's lots to learn and get used to. I'd suggest reading Conversational Git [1] for a gentle introduction and Pro Git [2] for a deeper dive (especially the chapter on branching). 1. http://blog.anvard.org/conversational-git/ 2. http://git-scm.com/book/en/v2 -- Bill Wohler aka http://www.newt.com/wohler/ GnuPG ID:610BD9AD