![]() Pulling the most recent changes from the repository is especially important when you and other team members work on a visual application, to keep the source files in your workspace up-to-date with everybody's changes. You can look back and see what you've done by using the Git History panel at the bottom of your workspace:ĭescription of the illustration githistory1.png VB Studio keeps track of all the Git actions you perform in your workspace by logging them as action details. A merge request describes the reason and scope of the changes to be merged, and often requires some team members to explicitly approve the request after they have reviewed the changes. You might be required to submit a merge request before the merge is permitted. When you’re completely done with your work, the next step is to merge your changes to the source of truth (for example, the main branch). Incorporate changes that other members make into the branch as often as you can using the Pull command. Some best practices can help you avoid conflicts: Update the remote branch with your changes frequently using the Push command. In this case, you or your teammate would have to take steps to manually resolve the conflict. Sometimes, both you and your teammate might change the same line in different ways, resulting in a conflict. ![]() If other team members are working on the visual application, you might all be working off the same branch and your work might overlap. Source code in the repository, including all branches, by opening Out the branch in their workspace and view the changes. Once your changes are part of the project’s Git repo, your team members can check ![]() (In Git terms, you do a Git Push operation to add it to the project’s Git repo if a team member does a Git Pull operation at this point, they will get a copy of your branch as well.) When you’re ready to publish the work you’ve done in your private branch, you first Push your changes into the remote repository, thereby exposing your changes as a branch to everyone else in your project. These commit messages can help you later to identify which files were changed and why. You can also add a commit message describing the reason you updated those files (for example, "Added new layout X for field Y"). This branch is where you work on your visual application.Īs you make changes, you frequently use the Commit action to save your source file changes to the local copy of your repository. Your workspace will contain a branch (which might be new or might already exist), but no one else can see the changes you make to the branch in your workspace until you choose to make them visible. When you create a workspace (or one is created for you), you get a clone of the project’s Git repository and all its branches. If you’re unfamiliar with Git commands, it may be helpful to review the relationship between your project, your workspace, and your Git repository. Here is a description of the icons that you'll see: These overlay icons indicate the status of the artifact or file with regard to the branch that your workspace uses (uncommitted, conflict, or recently added). When conflicts exist, the Git Panel provides tools to assist as you review and resolve issues.Ī series of overlay icons also appear when you create, modify, or delete files. You'll see a count of the files that have changed in the workspace as well as a color indicator of the type of changes green ( ) indicates new files, blue ( ) indicates modified files, and red ( ) indicates files that conflict with changes made by other team members. You can use this badge view-without actually accessing the Git Panel-to get a quick Git summary of your workspace. You can also perform operations at the file level in the Git Panel.Īs you make changes in your workspace, you'll notice the Git Panel badged to indicate status. It also includes a menu (Label 3 in the image) that lets you access a subset of the header's Git commands. In the Navigator's Git Panel (Label 2 in the image), which shows the status of your workspace files (for example, whether they are changed, untracked, or in conflict).In the header's Git menu (Label 1 in the image), which is a combination of your repository name and working branch or Scratch Repository if you chose that option.The Git commands that you'll use frequently to do your work show as follows: ![]() Within a workspace, the Designer connects you to the project's repository, enabling you to switch branches, push and pull sources, and merge changes-all through Git commands in the Designer. ![]()
0 Comments
Leave a Reply. |