From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Steinar Bang Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Sat, 04 Apr 2015 08:51:58 +0200 Organization: Probably a good idea Message-ID: <867fts9yi9.fsf@dod.no> References: <83twx2xoc8.fsf@gnu.org> <20150331104935.GB2871@acm.fritz.box> <87y4mdi7tj.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331214347.GH2871@acm.fritz.box> <20150401103225.GA2633@acm.fritz.box> <87h9t080gx.fsf@javad.com> <83384jsx3o.fsf@gnu.org> <83pp7nrfdn.fsf@gnu.org> <83a8yqr226.fsf@gnu.org> <831tk2qvz5.fsf@gnu.org> <87384ii26v.fsf@uwakimon.sk.tsukuba.ac.jp> <83wq1tptvp.fsf@gnu.org> <87pp7lhc9h.fsf@uwakimon.sk.tsukuba.ac.jp> <83sichpqe9.fsf@gnu.org> <87ioddglu6.fsf@uwakimon.sk.tsukuba.ac.jp> <83a8yoq56m.fsf@gnu.org> <87384ghm1a.fsf@uwakimon.sk.tsukuba.ac.jp> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1428130325 8237 80.91.229.3 (4 Apr 2015 06:52:05 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 4 Apr 2015 06:52:05 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Apr 04 08:51:57 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 1YeHvx-0000Z3-8i for ged-emacs-devel@m.gmane.org; Sat, 04 Apr 2015 08:51:57 +0200 Original-Received: from localhost ([::1]:36378 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeHvw-00041r-Ko for ged-emacs-devel@m.gmane.org; Sat, 04 Apr 2015 02:51:56 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51522) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeHvs-00041i-RU for emacs-devel@gnu.org; Sat, 04 Apr 2015 02:51:53 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YeHvn-0007A8-Rt for emacs-devel@gnu.org; Sat, 04 Apr 2015 02:51:52 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:58878) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeHvn-00079s-Kl for emacs-devel@gnu.org; Sat, 04 Apr 2015 02:51:47 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1YeHvk-0000QK-Qf for emacs-devel@gnu.org; Sat, 04 Apr 2015 08:51:44 +0200 Original-Received: from cm-84.208.248.210.getinternet.no ([84.208.248.210]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 04 Apr 2015 08:51:44 +0200 Original-Received: from sb by cm-84.208.248.210.getinternet.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 04 Apr 2015 08:51:44 +0200 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 45 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: cm-84.208.248.210.getinternet.no Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.4 (windows-nt) Cancel-Lock: sha1:7CphorNTH0YbFOvhAfmZSKcPYLk= 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:184851 Archived-At: >>>>> "Stephen J. Turnbull" : > It did? It's not clear to me. I still haven't seen an explanation of > how he ended up with a ton of modified files that he didn't touch, He uses vc-dir.el which doesn't clearly distinguish between staged and unstaged files, so it's quite possible that all but one of those files (ChangeLog) are staged and ready to go, once he does a git commit (I'm guessing here, but...) > or how he's going to get past that safely. I can't guarantee that he will get past that safely, but fixing the conflict markers in ChangeLog, then git commit git push (and probably) git pull git push might get him there (if conflict in ChangeLog was all there was, the "git commit" command will complain if there are more conflicted files). > Nobody has mentioned him doing a diff against a public reference > commit that *should* be where he started, in order to confirm that > when he pushes he can succeed Personally I never do that unless something fails, but then I mostly work on feature branches when I work with others, so it's git checkout master git pull --ff-only git merge my-feature-branch git push If the merge gets too messy or the push fails I can always go back to the pre-merge conditons and start again (after doing the necessary investigation). > (preferably without making the DAG too ugly, as well). The merge command is more robust than rebasing, so the emacs maintainers have stated that they don't care about the ugliness of the DAG (which I personally think is a wise decision).