opened
disconnect3d
username_0
before release
Merge dev to stable
issue
created
disconnect3d
username_0
@username_1 I can't merge stable without approval :P
comment
created
zachriggle
username_1
This seems backwards to me.  Why was 'dev' merged into 'stable'?
comment
created
disconnect3d
username_0
Did you _mean stable merged to dev_ - https://github.com/pwndbg/pwndbg/pull/381? I thought it would be clean to do so, to be 100% sure we have all fixes done to stable on dev.

@username_1 What do you mean by the arrows? ;D

lets assume dev is on `5390912 - Add capstone, unicorn versions to version command (#379) (2 days ago) <Disconnect3d>` - which it was before I hit `git merge stable` on `dev` and merged it on github (we can `reset --hard && push -f` or `git revert` and make a PR).

What should be done in such case?

Is it:
```
git checkout beta
git merge dev

git checkout stable
git merge beta
```
(above actually makes a conflict when merging beta to stable).

or the other way around?

Also, where should hotfixes go? Right way to stable and cherry-pick them on dev or the other way - merge them to dev and cherry-pick on stable?
comment
created
disconnect3d
username_0
Closing. I am not sure how to deal with that properly atm
comment