![]() ![]() Anyway, WSL makes it easy to work across Windows/Linux platform now. It has issue like this if try to use WSL-based p4 binary to work with Windows-based project. As you are aware, p4 binary needs to understand platform specific path. ![]() The guide listed in this section is based on WSL. Nowadays you can use p4.exe/ p4 through WSL to work with both Windows-based, and Linux-based project. It will show like in the following screen It usually displays the following lines Auto-merging file1.txtĬONFLICT (content): Merge conflict in file1.txtĪutomatic merge failed fix conflicts and then commit the result. ![]() When you attempt to merge, and result in merge conflict.
0 Comments
Leave a Reply. |