More help needed: GIT

[Duke]

1. I have 3 files that are always changed when I want to upbase:
#       modified:   .cproject
#       modified:   .project
#       modified:   src/ports/windows/win_local.h
As a result, I always have to do a stash save, upbase, stash pop. Quite annoying. Is there a better way to do that ?

2. The last stash pop produced a merge conflict in .cproject Resolving the conflict by editing doesn't seem to be an option for this file. And it seems I can't even rename the .cproject.REMOTE.cproject file ?!?
So what is the standard method to resolve such a conflict ?

[Duke]

I managed to resolve the conflict by
- using 'git mergetool' from the shell
- selecting 'take theirs' for every conflict and
- 'resolve' in TortoiseGIT
Is there a more elegant way to do this ?

The remainder of the above problems persists.

[Punkie]

I take it those files are needed in the repo because the tools need them to be there, at least for starting the first time. But the tools change them as you work.

If so, you can move them to a subdir in the repo, then add a script that copies them. The script should be started (only) the first time thus it can be added as a target in the new Makefile.
If needed, add crc check to see if the repo'ed version changed (look at it as if it was the template). Upon a failed check, the template in the subdir and the actual user modified copy should be merged. I dont know if its needed.

[Duke]

I take it those files are needed in the repo because the tools need them to be there, at least for starting the first time. But the tools change them as you work.

Fortunately not. Those files didn't work correctly for every platform, so I needed a modified version. The files are fixed now, so this problem is gone (for now).