project-navigation
Personal tools

Author Topic: The GIT problem::stashing  (Read 1521 times)

Offline Duke

  • Administrator
  • PHALANX veteran
  • *****
  • Posts: 1037
    • View Profile
The GIT problem::stashing
« on: October 08, 2010, 01:09:50 am »
- stashing
I don't mean the inconvenience of a few clicks around an upbase. I need a modified .cproject, .project and ufo.rc just to compile. I have no nice idea how to separate these from the actual changes in the source.

This is about the need to have changes that are to be committed and changes the never will be committed side by side, so they can't be stashed away together.

I can think of several situations where the above applies, but let's focus on the project files.
The slightest change (such as an additional path, compiler switches or just preferences) results in 'unstaged changes'.

This problem is not specific to GIT, but SVN easily solved it as long as the changes were mergeble. I guess many projects that use GIT have the same prob. Does anyone know how *they* solve it ?
« Last Edit: October 08, 2010, 01:45:11 am by Duke »