tinygo-org/tinygo-site

Fix Diverged Histories of dev and release branch

Closed this issue · 1 comments

sago35 commented

There is no difference between ① and ②. However, the histories of dev and release have diverged. I would like to fix this by performing one of the following actions. What do you think?

image

  1. git checkout dev && git merge origin/release
  2. git checkout dev && git reset --hard origin/release
deadprogram commented

I think I have now taken care of this, @sago35 thanks for pointing it out!