Re: [p4] File types in perforce
Sambwise <[email protected]>
| Newsgroups | gmane.comp.version-control.perforce |
|---|---|
| Message-ID | <[email protected]> |
Posted on behalf of forum user 'Sambwise'. There is a "utf8" filetype in Perforce (which handles BOMs and probably does validation to make sure everything is valid UTF8). If two files are content-wise identical but one is typed as "text" and the other is typed as "utf8", then during the resolve process you'll get asked to pick which type the new merged revision should have. The latest version of P4V should support this. If it's having problems, go to a command line and run "p4 resolve", which should be more straightforward. -- Please click here to see the post in its original format: http://forums.perforce.com/index.php?/topic/5489-file-types-in-perforce _______________________________________________ perforce-user mailing list - [email protected] http://maillist.perforce.com/mailman/listinfo/perforce-user