kaistshadow / blockchain-sim

Scalable blockchain simulator/emulator running on shadow simulator
MIT License
9 stars 1 forks source link

Clean stale branches which is not currently used #117

Open hjkim17 opened 3 years ago

hjkim17 commented 3 years ago

There are bunch of stale branches on the project. Many of them are not used currently, and it makes messy view on the project branches.

For the branch management, followings should be done.

  1. make dev branch, which is a fork of the current master.
  2. Each author of the stale branch should check whether the branch is bound to one or issues. 2-1. If the issue bound to the branch is already solved, merge it to the dev. 2-2. If the issue is not solved or the issue is long term issue, just change the branch name to the branch naming convention that previously we discussed. 2-3. If the branch is useless, backup and delete it (만약 지우게 될 경우 해당 branch로 체크아웃해서 백업부터 할 것).
  3. Each author should check the corresponding stale branches below:

hjkim17

ygnkim

tkdlqm2

victork86

victork86 commented 3 years ago

I've finished cleaning up unused branches. Below is the list

  1. ws-pr-shadow-dependencies-1
  2. ws-dev-eos-2.0.7
  3. ws-dv-eos-v.2.0.7
  4. ws-eos-v.2.0.7
victork86 commented 3 years ago

and I collaborated with tkdlqm2 in the following branches (devmonero*). And I don't use this list anymore. Please check whether tkdlqm2 also uses this branch @tkdlqm2

hjkim17 commented 3 years ago

The branches below is deleted, and backed up as patches for future usage.

ygnkim commented 3 years ago

Following branches are removed.

ygnkim commented 3 years ago

I also removed following stale branches.

ygnkim commented 3 years ago

I have created a develop branch. (https://github.com/kaistshadow/blockchain-sim/tree/develop)

ygnkim commented 3 years ago

I removed following branch. (#122 )

Also, I merged and removed following branch. (#123 )

ygnkim commented 3 years ago

@Emegua , I removed the branch yg-pr-shadow-churn. Instead, I have merged it into develop branch. So, you can work on 'develop' branch for using Erebus prototype implementation.

From now on, please follow the branch management rules when you make any commit for this repository.

For more information, please read this article (https://nvie.com/posts/a-successful-git-branching-model/).

Thank you.