Skip to content
This repository was archived by the owner on Apr 21, 2020. It is now read-only.

Traffic lights always red on local repository issues #62

@nanuaraj

Description

@nanuaraj

We want the traffic lights to turn yellow if they are not in sync with the remote branch, and red if updating the branch would cause a conflict. The mechanism for this is set up in js/trafficlights.js in gitUpdateCheck, gitUpdateCallback, gitMergeConflictCheck and gitMergeConflictCallback. gitUpdateCallback calls gitMergeConflictCheck. cmdOut should be set to empty string before gitMergeConflictCheck executes the command for checking merge conflicts. However, doing this in that function does not seem to clear cmdOut. We need further investigation on this issue to restore functionality for yellow lights, but this is likely related to gitMergeConflictCheck being called by an asynchronous function.

Metadata

Metadata

Assignees

Labels

Type

No type

Projects

No projects

Relationships

None yet

Development

No branches or pull requests

Issue actions