Michael Lu

Add work tracking and adding work log to an issue

**Describe the bug** When pushing a locally created branch that doesn't have a upstream branch the error comes up

Detect repository in conflict and display accordingly

**Describe the bug** Sometimes pull with rebase fails with "cannot rmdir" error **To Reproduce** TBD

Allowing searching commit by message and SHA hash. Also add filter to filter the search to either message or hash

Implement simple text editor to edit merge result when resolving conflicts

Implement simple conflict resolution panel

In conflict state, update the commit panel to show merge or abort button and hook up abort functionality

Allow editing of story point for a story in JIRA, currently it's display only

Implement cloning of a repo