Re: Making git as easy as CVS, for handling merge conflicts - Don't give up yet

[gameonlinux]

You could make a script to automate it into one command:
git add [FILE]
git commit -m "x" [FILE]
torify git push

Don't give up on git yet.
Otherwise what if you want to make large sweeping additions to the 
fully-free 3d videogame I contribute to?

( libregamewiki.org/Chaos_Esque_Anthology )

The engine is in C, the game code in QuakeC: which has No arrays! And no 
memory pointers! Doesn't that sound good? It only has floats, strings, 
and entities. Now there is a hack to add "arrays" but they are global in 
scope and 1 dimensional (so what's the point...), and static (can't be 
dynamically allocated).

RMS: don't you like QuakeC?

Please?
On 2019-11-05 03:14, Richard Stallman wrote:
> [[[ To any NSA and FBI agents reading my email: please consider    ]]]
> [[[ whether defending the US Constitution against all enemies,     ]]]
> [[[ foreign or domestic, requires you to follow Snowden's example. ]]]
>
> If you like the staging feature, I am glad that git pleases you.
> However, it meant that my simple recipe for committing my changes
> did not work.
>
> I will stick to CVS.