tech-pkg archive
[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index][
Old Index]
Re: Help with git/wip
On 07/26/2017 01:26 PM, coypu%sdf.org@localhost wrote:
both cvs and git would consider the file modified in those
circumstances, git just won't auto-merge anything untracked, whereas cvs
will move away your local changes - stash by default, that is harder to
pop.
Of course it was modified. That was what I was trying to commit.
Or do you mean by someone else? Subversion handles this so nicely. In
a similar situation it would abort the commit, saving the commit message
for my convenience, and tell me that I needed to update a file. If
there was a collision that couldn't be resolved automatically it would
allow me to edit the file to resolve it. Easy Peasy and I am back to
work right away.
Anyway, it seems I was able to find the right incantation but I had to
commit the deletion and the Makefile edit separately. I saw a similar
update that did both together so I assumed that it was possible.
--
D'Arcy J.M. Cain <darcy%NetBSD.org@localhost>
http://www.NetBSD.org/ IM:darcy%Vex.Net@localhost
Home |
Main Index |
Thread Index |
Old Index