Send Mark Resolution with airSlate SignNow

Send mark resolution

concurrent's development means multiple people can work on the same file at the same time this enables an efficient teamwork flow the conflicts may arise if two users change the same file or you edit a file version that is not the latest p4v provides a few features and tools for managing these conflicts for developers working with text files the preferred option is to check out and edit your files and then merge the changes into newer versions if needed for folks sharing binary files such as office docs images and other multimedia locking the file on check out works best let's walk through a merge using p4v before getting started on any work you can see the status of a file by looking at the icon a blue checkmark on the file indicates it's checked out by other users a quick mouse over shows Joe coder has this file out now we can also make changes to the Ebola file so we drag and drop it into the pending change list pane the red checkmark shows that we now have this file checked out other users will see this as a blue check on the Ebola file letting them know that we are working on it we open the file and make a quick edit and save it now we are ready to submit our change but we see from the yellow triangle that there has been some chickens and our file is now out of date we need to update our workspace to the latest version so we select get latest revision Ani bolt the question mark on the file indicates we have a conflict we will not be allowed to submit this file until the conflict is fixed so we context click and select resolve the resolved dialog appears and we are presented with view options except source means take the new file from the Depot and discard your changes accept target is the opposite it will replace the file currently in the Depot with yours when you perform the submit accept merged will automatically merge the two files together if there is no line-by-line conflict we will select run merge tool to perform the merge manually this is before merge p4v is built in 3 pane merge tool in the middle pane we can see the original file we checked out called the base on the left are the changes conflicting with ours source and on the right are the changes we entered target all three options are presented in the Edit window down below let's say our edit is the best option and we pick target by selecting the lucky charm character associated with that line or better yet let's take advantage of the editor window and make a completely different change once the merge is complete you save the file and close the merge tool a verification dialog appears to ensure we want to save the new merge file over our original edits when we select yes the merge operation is complete in our local workspace and the file is ready to be submitted to the Depot next we do a quick right-click to bring up the submit dialog box enter a short change list description and hit the submit button now the newest version of Ebel is in the Depot along with all the previously submitted versions for binary files such as office docs graphics audio and video it's easier to lock the file at checkout this prevents others from submitting changes and tours are completed the file lock is easy to engage once you check out a file it will appear in the pending change list with the usual red checkmark now context click the file and select lock or use the ctrl L shortcut other users will now see the blue checkmark and the lock icon letting them know that you have it checked out as the best practice it's good to use this only for binary files that cannot be merged together such as office docs and media files such as graphics audio and video thanks for watching