Loading...

XML

Word

Printable

Type: Bug
Resolution: Unresolved
Priority: Medium
Fix Version/s: None
Affects Version/s: 3.1.1
Component/s: Diff
Labels:
None
Environment:

Hide

I use Sourcetree 3.1.1 on MacBook Pro (Mojave 10.14.3) and Bitbucket Cloud.

My team was testing merging/conflict solving using P4Merge (Rev. P4Merge/MACOSX1013X86_64/2018.2/168776).

Check this [video demo|https://youtu.be/kcs6SilfclU.]

After saving it with P4Merge, I couldn't stage the Java Source file.

Also, it created a file with an ORIG (Original) file extension.

Hope this can be fixed, please.

Show
I use Sourcetree 3.1.1 on MacBook Pro (Mojave 10.14.3) and Bitbucket Cloud. My team was testing merging/conflict solving using P4Merge (Rev. P4Merge/MACOSX1013X86_64/2018.2/168776). Check this [video demo| https://youtu.be/kcs6SilfclU .] After saving it with P4Merge, I couldn't stage the Java Source file. Also, it created a file with an ORIG (Original) file extension. Hope this can be fixed, please.