From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: phillip.lord@newcastle.ac.uk (Phillip Lord) Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] master f9fabb2 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs Date: Thu, 28 May 2015 16:44:52 +0100 Message-ID: <87egm07ll7.fsf@newcastle.ac.uk> References: <20150527165006.32357.80915@vcs.savannah.gnu.org> <87egm13yrm.fsf@gmx.de> <838uc8yd3c.fsf@gnu.org> <87617c3fq3.fsf@gmx.de> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1432827947 13352 80.91.229.3 (28 May 2015 15:45:47 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 May 2015 15:45:47 +0000 (UTC) Cc: Eli Zaretskii , bruce.connor.am@gmail.com, emacs-devel@gnu.org To: Michael Albinus Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu May 28 17:45:40 2015 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 1YxzzU-0005aH-KE for ged-emacs-devel@m.gmane.org; Thu, 28 May 2015 17:45:05 +0200 Original-Received: from localhost ([::1]:59655 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxzzT-0007gS-Qm for ged-emacs-devel@m.gmane.org; Thu, 28 May 2015 11:45:03 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42627) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxzzQ-0007gF-G0 for emacs-devel@gnu.org; Thu, 28 May 2015 11:45:01 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxzzP-0007hs-HJ for emacs-devel@gnu.org; Thu, 28 May 2015 11:45:00 -0400 Original-Received: from cheviot22.ncl.ac.uk ([128.240.234.22]:41824) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxzzM-0007hD-BE; Thu, 28 May 2015 11:44:56 -0400 Original-Received: from smtpauth-vm.ncl.ac.uk ([10.8.233.129] helo=smtpauth.ncl.ac.uk) by cheviot22.ncl.ac.uk with esmtp (Exim 4.63) (envelope-from ) id 1YxzzI-0001ec-Fc; Thu, 28 May 2015 16:44:52 +0100 Original-Received: from jangai.ncl.ac.uk ([10.66.67.223] helo=localhost) by smtpauth.ncl.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.63) (envelope-from ) id 1YxzzI-0003wR-MC; Thu, 28 May 2015 16:44:52 +0100 In-Reply-To: <87617c3fq3.fsf@gmx.de> (Michael Albinus's message of "Thu, 28 May 2015 17:05:08 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.0.0.0 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 128.240.234.22 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:186914 Archived-At: Michael Albinus writes: > That's what I did, likely. > > However, the tip might give me a way to bring the git repo back to a > stable state, with potential loosing of local changes. As long as I'm > not fluent in solving merge conflicts, that's good to know. > >> OTOH, merge conflicts are nothing to be afraid of, the procedure to >> handle them is simple and straightforward. Michael (and every one >> else here) should IMO master that simple procedure, instead of >> avoiding it. >> >> In a dVCS, you cannot rely on being able to avoid merges all the time >> anyway. There are always races with other developers. > > If git would be more friendly to tell what happens ... why the hell I > must take care on files I've never touched myself. Perhaps the sensible way forward would be to push to a branch either on or off the the main repo and then do a request pull. Much easier for anyone scared of git (like me). Of course, some one has to be able to answer the request, but then having this set up would be no bad thing anyway, for those without commit access, as well as those just scared. Phil