Path: ...!eternal-september.org!feeder3.eternal-september.org!news.eternal-september.org!eternal-september.org!.POSTED!not-for-mail
From: Lawrence D'Oliveiro <ldo@nz.invalid>
Newsgroups: comp.lang.fortran
Subject: Re: converting a 700,000+ line Fortran 77 plus 50,000+ line C++
 program to C++, part 2
Date: Fri, 11 Apr 2025 22:08:02 -0000 (UTC)
Organization: A noiseless patient Spider
Lines: 13
Message-ID: <vtc3s1$2mlfb$2@dont-email.me>
References: <vt3vje$2uq60$4@dont-email.me> <vt570a$4np7$3@dont-email.me>
	<vt6itt$1as70$1@dont-email.me> <vt73ot$1pl6i$2@dont-email.me>
	<vt96on$3kr0i$7@dont-email.me> <vt97i9$3ml31$3@dont-email.me>
	<vt9a0j$3pc2b$1@dont-email.me> <vtagaa$10d1v$1@dont-email.me>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Injection-Date: Sat, 12 Apr 2025 00:08:02 +0200 (CEST)
Injection-Info: dont-email.me; posting-host="2e5924fe3d9905cd5f265cdbfb6deffb";
	logging-data="2840043"; mail-complaints-to="abuse@eternal-september.org";	posting-account="U2FsdGVkX1/h9673sQ6aGAunp/dyFYjT"
User-Agent: Pan/0.162 (Pokrosvk)
Cancel-Lock: sha1:lj/I0gf7kYMoGl2YN7qMkzNmoiA=
Bytes: 1712

On Fri, 11 Apr 2025 07:28:10 -0000 (UTC), Thomas Koenig wrote:

> I find git very unpleasant to work with.  Merge conflicts are handled
> quite ungracefully ...

Use something else that handles merges better, then.

> ... but my main problem is that I have no mental model
> of what is happening with which command (which means that I remove my
> local copies of the repos from time to time).

The commit structure is a DAG. People tend to groan every time that comes 
up, but it’s a core concept.