Code

Add merging functionality and UI#600

Code

Merged

fcollonval merged 8 commits intojupyterlab:masterjupyterlab/jupyterlab-git:masterfrom ianhi:add_mergingianhi/jupyterlab-git:add_mergingCopy head branch name to clipboardOct 16, 2021

+457-41

Commits

Commits on Oct 15, 2021

• first pass at merging UI

  Show description for 84fcb55
  

  ianhi

  authored and

  fcollonval

  committed
  84fcb55

  Copy full SHA for 84fcb55

• Add merge branch action button

  fcollonval

  committed
  4cb6e9a

  Copy full SHA for 4cb6e9a

Commits on Oct 16, 2021

• Add merge command

  fcollonval

  committed
  2ff6822

  Copy full SHA for 2ff6822

• Replace ... by ellipse

  fcollonval

  committed
  4002a18

  Copy full SHA for 4002a18

• Fix styling

  fcollonval

  committed
  4c1a980

  Copy full SHA for 4c1a980

• Use command every where

  fcollonval

  committed
  fc8d150

  Copy full SHA for fc8d150

• Self review

  fcollonval

  committed
  4475f2c

  Copy full SHA for 4475f2c

• Add and fix tests

  fcollonval

  committed
  0907221

  Copy full SHA for 0907221