Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean stale branches which is not currently used #117

Open
hjkim17 opened this issue Dec 14, 2020 · 8 comments
Open

Clean stale branches which is not currently used #117

hjkim17 opened this issue Dec 14, 2020 · 8 comments
Assignees

Comments

@hjkim17
Copy link
Collaborator

hjkim17 commented Dec 14, 2020

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

  • newbleep_data_layer
  • object_share
  • random_source_fix
  • dedup_exp1
  • dedup_dev
  • normal_dedup_compare_stable
  • shadow_bleep_fix1
  • shadow_bleep_fix_instrumentation
  • tcmalloc_dir
  • coinflip

ygnkim

  • yg-amazon-exp
  • yg-pr-zmq-ipc
  • yg-pr-fix-minor-bug
  • yg-pr-bitcoin-attacker
  • yg-pr-shadow-geth

tkdlqm2

  • HongJoon_dependencies_1
  • Mongs
  • Mongs-pr-shadow-bitcoin_sim
  • dev_monero_hj

victork86

  • ws-pr-shadow-dependencies-1
@victork86
Copy link
Collaborator

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
Copy link
Collaborator

victork86 commented Dec 14, 2020

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

@hjkim17
Copy link
Collaborator Author

hjkim17 commented Dec 15, 2020

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

  • newbleep_data_layer
  • object_share
  • random_source_fix
  • dedup_exp1
  • dedup_dev
  • normal_dedup_compare_stable
  • shadow_bleep_fix1
  • shadow_bleep_fix_instrumentation
  • tcmalloc_dir
  • coinflip

@ygnkim
Copy link
Member

ygnkim commented Jan 7, 2021

Following branches are removed.

@ygnkim
Copy link
Member

ygnkim commented Jan 7, 2021

I also removed following stale branches.

  • memleak_fix
  • futex_syscall_yonatan
  • golang_mainGo

@ygnkim
Copy link
Member

ygnkim commented Jan 7, 2021

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

@ygnkim
Copy link
Member

ygnkim commented Jan 11, 2021

I removed following branch. (#122 )

  • yonatan_geth

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

  • go-ethereum

@ygnkim
Copy link
Member

ygnkim commented Jan 14, 2021

@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.

  • Do not work on master branch. Instead work on develop branch.
  • Whatever you want to add or modify on the repository, make a Github issue first.
  • Create separate branch for the issue.
  • Follow the branch-naming convention.
  • When you want to add a feature/functionality/test which is relatively large, create a feature branch.
  • Feature branch's naming convention is 'feature/<issue #>/<description>'. For example, 'feature/128/sybil-API'.
  • When you want to add a feature/functionality/test which is relatively small, create a issue branch.
  • Issue branch's naming convention is 'issue/<issue #>'.
  • When starting work on a new feature (branch), branch off from the develop branch.
  • When starting work on a new issue (branch), branch off from the develop, or feature branch.

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

Thank you.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

4 participants