I am working with another developer on the other side of the country which is the lead on our project, and not the formal version Using Control System At my end, I see all my code in GIT. I recently started contributing to the main project, and would like to be able to track other developer updates too.
When I get its updated code, it usually happens as a zip file. If I open the file in my GIT Work folder, then GIT believes that every file has changed, probably because the information about the state has changed.
What I would like to see is a way I can open a new code with copying my work, and just merge into changes. What is the best way to do this? Since it is a powerbuilder project, most files are binaries.
Thank you!
BITIES, if stored in GET, are bound to create a new version (i.e. the next commitment But to be kept in mind).
So: do you need those binary, or can you rebuild them?
It is in the calculation
for formulas, in the guit, and file date (timestamp), because the contents of external files can vary considerably in its content ( More files, temporary files, files that should be ignored ...), this would be best:
- Unzip in a separate directory
- A device to detect Use changes based on content, merge them, and then cave Commit the files that have actually evolved.
You simply compare two sets of directories and files: one where you unzipped the development of your far-away partner, and in which you are currently working.
Thanks t O stating that timestamps are not part of SHA1 computation. Only:
- Size
- The contents of a blobes are part of
:
However, when large Import of files is externally managed in GIT repositories, so you have a risk of adding new files to guit-managed directories, their content changes, so their SHA1 key, even if changes in older GIT-managed files Have not happened
This means that many changes in the tree are artificial if these new files are only temporary files or files which should be ignored / restarted / reproduced.
The above process only sets an external of files and detects what has changed between a git-managed set of file and judge Be sure to have an external method, if it should be a part of git, the work directory or not.
Comments
Post a Comment