![]() Many organizations use branches for each piece of work whether it is a feature, bug or chore item. When you've finished, you merge the changes made in the branch back in to the master repository. If the work takes a while or master gets a lot of updates since the branch was made then merging or rebasing (often preferred for better history and easier to resolve conflicts) against the master branch should be done. The only time you need to do manual changes (actually editing a file) is if two changes involve the same line(s) of code.īranches allow you to preserve the main code (the 'master' branch), make a copy (a new branch) and then work within that new branch. It actually does an amazing job of merging file changes (within the same file!) together during pulls or fetches/pushes to a remote repository such as GitHub. Git doesn't 'lock' files at all and thus avoids the 'exclusive lock' functionality for an edit (older systems like pvcs come to mind), so all files can always be edited, even when off-line. It is also different from SVN in this respect as you could go to any individual version without 'recreating' it through delta changes. Git stores each version of a file that changes by saving the entire file. This is different from systems like SVN where you add and commit to the remote repository immediately. ![]() git) which you commit your files to and this is your 'local repository'. This answer includes GitHub as many folks have asked about that too. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |