search

tinygo-org / tinygo-site

Web site for TinyGo project.
https://tinygo.org
57 stars 112 forks source link

Fix Diverged Histories of dev and release branch #409

Closed sago35 closed 4 months ago

sago35 commented 5 months ago

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 4 months ago

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