Christian Moe <[email protected]> writes:
> I quickly found that git pulls would overwrite my hand-edited
> Makefile, and a hand-edited Makefile caused conflicts on the next
> pull, and I didn't understand git at all.
You could set up your own local branch to track origin/master and
preferrably using rebase instead of merge. That will result in the
following configuration (in .git/config):
[branch "local"]
remote = origin
merge = refs/heads/master
rebase = true
>From then on, you can just do "git pull" and your changes to the
Makefile will dutifully re-enacted by git.
Achim.
--
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+
SD adaptation for Waldorf microQ V2.22R2:
http://Synth.Stromeko.net/Downloads.html#WaldorfSDada
