![]() If a conflict cannot be resolved automatically, then this is indicated in the Git Status & Staging view. Depending on the case and the set merge Options, automated actions will run or manual actions are necessary. If conflicts occur while merging, then they have to be resolved first. The current branch is the one whose status is now in the working directory. When you confirm the request (dialog prompt) whether or not you really want to commit, the commits of the currently selected branch are committed to the current branch. The Merge Branch dialog opens where you can select the Options which is valid for the current merge action. To do this, use the arrow key to select the Merge with options command. Alternatively, you could also set options for it. This means that work will continue immediately on this branch.Ĭlicking the button will execute the command directly. This branch is now created and set as "current" and tracking is activated. With the Force option, the operation can still be forced.Īttention: The existing branch will be overwritten by this. CODESYS Git wants to create a local branch, but the name for it is already in use. In this case, there was not yet a local remote branch tracking the currently selected remote branch. This name for the local branch is already used. With the Force option, these inconsistencies can be accepted initially and the checkout can still be performed.Ĭhecking out this remote branch will create a corresponding local tracking branch. It is possible that the checkout is denied at first, because of inconsistencies caused by local changes made directly in the working directory. Then this local branch is loaded into the working directory for editing. In this case, there is already a local remote branch (under Local ()) which tracks the currently selected remote branch and can therefore Pull and Push with it. ![]() A dialog opens with the message: This remote branch is already tracked by local "master" branch, which will be checked out instead.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |