Code

Fix merge from forks#78

Code

Closed

franklinhu wants to merge 3 commits intomasteropenzipkin/zipkin:masterfrom remote_mergeopenzipkin/zipkin:remote_mergeCopy head branch name to clipboard

+15-5

Commits

Commits on Jul 19, 2012

• Fix merging from a fork

  

  Franklin Hu

  committed
  38ca702

  Copy full SHA for 38ca702

• fix syntax

  

  Franklin Hu

  committed
  50e7f80

  Copy full SHA for 50e7f80

• don't delete local/remote branches if it's a fork

  

  Franklin Hu

  committed
  d76bcef

  Copy full SHA for d76bcef