![]() Note that conflicts here should not arise in the git objects as these should be uniquely named (SHA1) and only be added, but any of the housekeeping files that keep track of branch pointers and such will easily get into a conflict. The unity of these modifications belonging together has been lost. Conflict files would be created but depending on the order of things you might have 4 files that have changed on one computer and then the same 4 files changed on another, however due to the synchronization, ordering, and conflicts, you end up with 2 of them from the first computer and the other 2 from the other computer. The biggest source of problems this kind of situation could create is when modifications done on separate computers are mixed. If both files was renamed you have now corrupted your repository. Git or any other of the tools won't look at this conflicting file. How conflicts are handled varies but for some of them an extra file is created with a "-conflict" filename. Then the synchronization kicks in and in some cases will get conflicts.Before or while this has completely synchronized your changes you start doing commits or other operations.On one computer you commit a new changeset. ![]() Here's an example of how you can easily mess up your repositories: This includes git, mercurial, fossil, bazaar, etc.įor synchronization tools this includes Dropbox, Google Drive, OneDrive, Jottacloud, etc.īecause these tools doesn't consider the repository as a unit, they consider the individual files inside on a file-by-file basis. You should never synchronize git or any other dvcs repository using any such synchronization tools.
0 Comments
Leave a Reply. |
Details
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |