Conflict marker doesn't show anymore in the navigator panel

Originator:Schaeffer.Peter9
Number:rdar://32016034 Date Originated:05-mai-2017 05:19 PM
Status:Open Resolved:
Product:Developer Tools Product Version:8.3.2 (8E2002)
Classification:UI/Usability Reproducible:Always
 
Summary:
Before Xcode 8.0, when you did a merge with a scm command line tool  and conflicts happened, when you opened the corresponding project in Xcode, a little "c" icons was appearing ( like the "a" or the "m" when a file is added or modified since the last commit). Since Xcode 8.0, nothing appears on the conflicted files.

Steps to Reproduce:
1. Install Xcode 8.x (reproductible on xcode from 8.0 to 8.3.2)
2. Open a project under version control
3. Do a merge from another branch which cause conflicts on certain files from the terminal
4. Look for file status on the navigator pane

Expected Results:
A little "c" should appear in the navigator panel  near each file containing conflicts indicating the file has conflicts. Those files should appear when the filter "show only files with source control status" is enabled.

Actual Results:
The little "c" icon doesn't show-up for conflicted files, instead no status is shown for those file making impossible to identify conflicted files like before


Version:
8.3.2 (8E2002)

Notes:

Comments


Please note: Reports posted here will not necessarily be seen by Apple. All problems should be submitted at bugreport.apple.com before they are posted here. Please only post information for Radars that you have filed yourself, and please do not include Apple confidential information in your posts. Thank you!