To prove this worked we will ask the depot to run a grep for us of all the files that are named source.c to match all lines (. The -am flag tells resolve to do automatic resolutions if possible, then we submit the pending changelist: p4 submit -c 4 desktower/DEV/source.c - copy from //depot/MAIN/source.c home/project/DEV/source.c - merging //depot/MAIN/source.c#2ĭiff chunks: 0 yours + 1 theirs + 0 both + 0 conflicting This is easily resolved though, and we can use an automatic resolve: p4 resolve -am This is telling us that there is a conflict between MAIN/source.c and DEV/source.c as there has been an edit. Submit failed - fix problems above then use 'p4 submit -c 4'. Merges still pending - use 'resolve' to merge files. If we now make a change to source.c and repeat the integration we will get a different response: p4 edit MAIN/source.c If DEV/source.c does not exist already then the submit will not ask any resolution questions. The -d parameter in the submit command sets the changelist description to 'branch' when we submit. If you wish to take file MAIN/source.c and merge it with DEV/source.c then you would run: p4 integ MAIN/source.c DEV/source.c Integration is the method of taking one file and either copying it or merging it with another file.
0 Comments
Leave a Reply. |
Details
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |