Path: csiph.com!v102.xanadu-bbs.net!xanadu-bbs.net!feeder.erje.net!eu.feeder.erje.net!feeds.phibee-telecom.net!newsfeed.xs4all.nl!newsfeed4.news.xs4all.nl!xs4all!post.news.xs4all.nl!not-for-mail Return-Path: X-Original-To: python-list@python.org Delivered-To: python-list@mail.python.org X-Spam-Status: OK 0.003 X-Spam-Evidence: '*H*': 0.99; '*S*': 0.00; '16,': 0.03; 'subject:: [': 0.04; 'revision': 0.07; 'subject:Question': 0.07; 'cest': 0.09; 'git': 0.09; 'python': 0.11; 'suggest': 0.14; '>in': 0.16; 'elsewhere,': 0.16; 'expert,': 0.16; 'finney': 0.16; 'git.': 0.16; 'labelled': 0.16; 'merely': 0.16; 'pep8': 0.16; 'relevant.': 0.16; 'subject:branches': 0.16; 'to:addr:pearwood.info': 0.16; 'to:addr:steve+comp.lang.python': 0.16; 'files.': 0.16; ':-)': 0.16; 'wrote:': 0.18; 'do.': 0.18; 'commit': 0.19; 'subject:] ': 0.20; 'helpful': 0.24; 'question': 0.24; 'post': 0.26; 'least': 0.26; 'asking': 0.27; 'to:2**1': 0.27; 'to:no real name:2**1': 0.29; 'topic': 0.29; 'code': 0.31; 'posting': 0.31; "d'aprano": 0.31; 'provide.': 0.31; 'question:': 0.31; 'sep': 0.31; 'steven': 0.31; 'writes:': 0.31; 'entirely': 0.33; 'header:Received:9': 0.33; 'advice': 0.35; 'agree': 0.35; 'editor': 0.35; 'but': 0.35; 'there': 0.35; 'programming,': 0.36; 'skip:> 10': 0.36; 'charset :us-ascii': 0.36; 'should': 0.36; 'application': 0.37; 'skip:- 20': 0.37; 'list': 0.37; 'filter': 0.38; 'question,': 0.38; 'to:addr:python-list': 0.38; 'files': 0.38; 'list,': 0.38; 'short': 0.38; 'bad': 0.39; 'to:addr:python.org': 0.39; 'changed': 0.39; 'experts': 0.60; 'is.': 0.60; 'received:98.137': 0.60; 'hope': 0.61; 'more': 0.64; 'here': 0.66; 'believe': 0.68; 'frank': 0.68; 'friendly': 0.72; 'quality': 0.72; 'received:98.138.229': 0.84; 'sound.': 0.84; 'received:98.138.226': 0.93 X-Yahoo-Newman-Property: ymail-4 X-Yahoo-Newman-Id: 5193.55447.bm@omp1008.mail.gq1.yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s1024; t=1410854450; bh=iKox815yPmP3iXjtM82FoseGuTofWYkvIHBH0wCBjbg=; h=Message-ID:Date:From:Subject:To:MIME-Version:Content-Type; b=t27BFRZc07wjqMDq/2QVWcSoL0RJ8zlY8JDuDWXXruQaYfNCZW2BJSqlClbT+DeCE/TCVR30cjDAonM2waUDQyoTFRgOaBHXxLuZkMHPYxRl6qgYeWJJAdAWe5nwLy5qkOpeY81sh/J/UYaLHG9vDGTOfxA1xEUFHWjT3pE0nfg= X-YMail-OSG: A8V.6ZsVM1ksMulAnusoFv.jCxnGZD8k6kE2vprgbdAMb9q tANrPms.VHm_Hz.U0H9J.2A8MMf7bYRoWuMiAOEjeafT2bM.pyGP9j6zAUQJ NACfH7RNyF_3MGqObQf.YIqckD2kJxXPQvf6pFuH0lCeckY2sebj.APZoY94 _WewMAWnJ5xbtcS3iauqlPGQThipALDSAFpWH6NCPkLnarisuspJH._TEHph EcuLmT22Wkxp28v5D.6DtxDc5RSPvElBqIaTFH4BKoKAj2vuX_u8v.POL8nF lf.0EyhsRF0p_ZpXZxdik6HDrsZCKfVqylhRvqByyOu2Ysoey1Ncvv27A7nw y46Skmhcs6rG.U005mOsBV0Ty0lNvANXebVgYSKZiRQDlyruYnnXhLWBIvpY .PB5FIW8xmeJLTNufriP9zRL2HMygHFrtZVh8YoHkp55RL0OqOYsj3BEXwnO 1oBUwVrit6wQhF4NnHUnka5BUZgKi2aVkvsONLiVUULwtzsdZ9Sc88oejrrl oZ0h3t85Q2wQv6IX.fjHZS0eQsBXCqWSf6822tkAD7LDzYWBHOOj1ZA7TpnW T4RFXyYY- X-Rocket-MIMEInfo: 002.001, Ci0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQpPbiBUdWUsIFNlcCAxNiwgMjAxNCA5OjM3IEFNIENFU1QgU3RldmVuIEQnQXByYW5vIHdyb3RlOg0KDQo.QmVuIEZpbm5leSB3cm90ZToNCj4NCj4.ICJGcmFuayBNaWxsbWFuIiA8ZnJhbmtAY2hhZ2ZvcmQuY29tPiB3cml0ZXM6DQo.PiANCj4.IEkga25vdyB0aGVyZSBzb21lIEdpdCBleHBlcnRzIG9uIHRoaXMgbGlzdCwgc28gSSBob3BlIHlvdSBkb24ndCBtaW5kDQo.PiBtZSBwb3N0aW5nIHRoaXMgcXVlc3Rpb24gaGVyZS4NCj4.IA0KPj4gSSBkby4BMAEBAQE- X-Mailer: YahooMailWebService/0.8.203.696 Date: Tue, 16 Sep 2014 01:00:50 -0700 From: Albert-Jan Roskam Subject: Re: [OT] Question about Git branches To: steve+comp.lang.python@pearwood.info, python-list@python.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-BeenThere: python-list@python.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: General discussion list for the Python programming language List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Newsgroups: comp.lang.python Message-ID: Lines: 39 NNTP-Posting-Host: 2001:888:2000:d::a6 X-Trace: 1410854617 news.xs4all.nl 2937 [2001:888:2000:d::a6]:45720 X-Complaints-To: abuse@xs4all.nl Xref: csiph.com comp.lang.python:77919 ----------------------------- On Tue, Sep 16, 2014 9:37 AM CEST Steven D'Aprano wrote: >Ben Finney wrote: > >> "Frank Millman" writes: >> >> I know there some Git experts on this list, so I hope you don't mind >> me posting this question here. >> >> I do. There may be experts on parquetry flooring in this forum, but a >> topic is not on-topic merely because some people here may know about it. > >(1) Frank labelled the post [OT] so that people not interested in off-topic >posts can filter it. > >(2) Parquetry flooring has nothing to do with Python programming, while >source control is very relevant. Asking questions about revision control is >at least as on-topic as asking what editor one should use for Python >programming, a question I note you have been known to respond to :-) > >In my opinion, objecting to Frank's question is not as friendly or helpful a >response as I believe we should aim to provide. A more friendly response >would have been to suggest that he would likely get better quality answers >by elsewhere, but without the editorialising. It's your right to have a >different opinion, of course, and you can continue to agitate for a >stricter application of on-topic questions, but I just wanted to say I >don't fully agree with your position in this matter. > >Frank, I am not a git expert, and I don't have an answer for your question, >sorry. Ben's advice to ask it elsewhere is sound. list I entirely agree with Steven. VCS is about good software craftmenship. It is just as on-topic as PEP8 is. Vcs is for code what toothpaste is for teeth. Witout it you get bad breath and code smell :-) Wrt the question: I think you should commit or stash files before switching branches. Also 'add' files to make them known to Git. I always use 'commit -a -m' to automatically stage all changed files. In short your working copy should be clean before switching branches.