search

veres-one / did-veres-one

A Decentralized Identifier utility library for Veres One
BSD 3-Clause "New" or "Revised" License
9 stars 4 forks source link

Merge 14.x to main. #85

Closed davidlehn closed 2 years ago

davidlehn commented 2 years ago

The branches and release style in this repo got a bit awkward. This commit is merging the active v14.x branch back on to main. The latest code and primary releases will then continue to be on main, and version branches (v13.x, v14.x, v15.x, etc) will branch off of main as needed. Handling releases and network versions will be done per version as needed and with documentation.

dmitrizagidulin commented 2 years ago

Never thought I'd live to see the day!! :) (that this branch would merge to main)

davidlehn commented 2 years ago

Regular GitHub merge and rebase did not want to cooperate. It tried to create another merge instead of just doing what was in this pr. Force fixed on command line to minimize non-linear history and clean up the versioning and branch situation.