Travis Finkenauer

(Response added here instead of #2011 so I can quote @XVilka comment) > @aquynh another option would be to let `master` be, but to make a new branch - `main`,...

Sorry for not being clear. :smile: > the `main` branch is only updated when we release the new versions, and at that time we merge `next` to `main`, like we...

> @tmfink you can avoid conflicts during the merge using: @XVilka Yes, we could use the ["ours" merge strategy](https://git-scm.com/docs/git-merge#Documentation/git-merge.txt-ours-1) to effectively ignore all changes that went into the latest stable...

@XVilka I think both of those strategies would be more complicated and require more work for all contributors than what I have described above. > @aquynh another option would be...

Perfect! On Sun, May 7, 2023, 04:59 Nguyen Anh Quynh ***@***.***> wrote: > We can rename "main" to "v5", does that work for you? > > And we can make...

I like all of the changes. I would say the only thing left is to: - [lock]() the `master` branch (I can't do that) - add a wiki page documenting...

I created a wiki page describing the [branching model](https://github.com/capstone-engine/capstone/wiki/Branching-Model).

@persytry thanks for the enhancement request. I even have this as a "todo" comment currently: https://github.com/capstone-rust/capstone-rs/blob/74ccb095fcdae06a6877d7be464fcccf9686284b/capstone-rs/src/arch/x86.rs#L27-L28

> To work around this when `cargo miri test` runs doctests, `cargo-miri` sets the RUSTDOC variable to itself, and then adjusts the `--test-builder` and `--runtool` flags. (`--runtool` is needed since...

> What I wonder is... RUSTC_WRAPPER is applied by cargo, not rustc. So shouldn't it be cargo's job to also apply it when invoking rustdoc? cargo could supply appropriate values...