Classical centralized version control systems like Subversion (SVN) use working copies which are related to exactly one repository. The following section helps you to easily start-up with Git and tries to give you an understanding of the fundamental concepts of Git for efficient working.įirst, we need to define some Git-specific names which may differ in their meaning with those you already know from other version control systems, for example Subversion. We want to thank all users, who have given feedback to SmartGit and in this way helped to improve it, e.g., by reporting bugs and making feature suggestions. Typical areas of applications are software projects, documentation projects or website projects. SmartGit’s target audience are users who need to manage a number of related files in a directory structure, to coordinate access to them in a multiuser environment and to track changes to these files. Git is a distributed version control system (DVCS). SmartGit is a graphical Git client which runs on all major platforms. 20 5 Installation and Files 5.1 Location of SmartGit’s settings directory 5.2 Notable configuration files. 20 4.3 Specifying VM options and system properties. 3.3 Local Operations On The Working Tree. 3.2 Synchronizing With a Remote Repository 3.2.1 Push. 2.3.2 Branches Are Just Pointers 2.4 Commits. Whether you want to or not is up to you.1 Introduction 2 Git-Concepts 2.1 Repository, Working Tree, Commit 2.2 Typical Project Life-Cycle. Note that entidades is still not merged into master however, if it is now based on master itself (the latest commit, as opposed to some ancestor), then you could fast-forward master to entidades. ( -f means "force" you need to force it because you are re-writing history, and this is typically something you should do with care, for the reasons above.) In order to push the new entidades to origin, you would need to git push -f. (Anyone who has made changes or branches to entidades would separately need to also rebase their changes, and this can be a tedious or just onerous process for them.) The recommended advice is thus to not rebase things that have been pushed, since this can mess with people. However, once you've pushed changes to some remote, other people could be basing their changes off the original entidades: they would notice your history re-writing. Rebasing is typically "socially acceptable" if you haven't pushed the branch, because then you're the only one that can tell that history was ever changed. entidades has commits D.B´, whereas origin/entidades has commits D.B. You can see this here, in that entidades and origin/entidades have diverged: they both have commits unique to themselves. We have changed the branch's "base", or "rebased" it. rebase here will change it to be based off of commit A. RebaseĪ rebase of entidades onto master would look something like this: * B´ (entidades)Īs I've shown it, entidades was originally "based off of" commit D, because that is where it diverged from master the changes you made are "based" on that point. If this is what it does, if you then do a git commit, you'd end up at exactly the same point as Create Merge Commit the former option just gives you an opportunity to edit the commit. One of your other options, Merge to Working Tree, I think, would perform the merge, but leave the result uncommitted. Typically, if you're done working on entidades (e.g., it was a feature branch, and the feature is now merged into master), you would also delete that branch both locally and from the remote. Then, you'd likely push master to origin. (Causes them to be same.) It would look like this: * M (master) (Your screenshot seems to confirm this.)Ī merge simply creates a commit that unifies the state of two branches. I'm also assuming you're merging entidades into master. (Such a digram might clarify your question.) You should learn how to display / view such diagrams in your tool: they'll help you understand both what the current history looks like, and what your changes to it would do. (newer commits are on the top of that diagram, older on the bottom) In other words, entidades diverged from master some time ago, and you want to choose between these options. I'm going to assume your history looks something like this: * A (master, origin/master)
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |