Code

Better handling of add/add conflicts#728

Code

Open

novalis wants to merge 4 commits intotwosigma:mastertwosigma/git-meta:masterfrom novalis:more-rebasenovalis/git-meta:more-rebaseCopy head branch name to clipboard

+111-15

Commits

Commits on Sep 7, 2019

• add test for add/add non-conflict

  novalis

  committed
  675e870

  Copy full SHA for 675e870

• Handle nulls in formatting for repo ast operations.

  novalis

  committed
  aa7bb4b

  Copy full SHA for aa7bb4b

• Test that add/add conflicts happen

  Show description for ea3c3aa
  novalis

  committed
  ea3c3aa

  Copy full SHA for ea3c3aa

Commits on Sep 12, 2019

• give a more verbose message on add/add conflicts

  novalis

  committed
  34ed09b

  Copy full SHA for 34ed09b