search

llvm / circt

Circuit IR Compilers and Tools
https://circt.org
Other
1.57k stars 277 forks source link

Non-linear commit history. #7255

Closed hailongSun2000 closed 2 days ago

hailongSun2000 commented 2 days ago

I'm so sorry to break down the commit history. I'm so sorry to cause the unnecessary trouble. :sweat: When I merged this PR https://github.com/llvm/circt/pull/7216, I just rebased the commit history in my local branch, and forgot to push it. I'm so sorry for this mistake. Anyone can help me? Very very thanks! And I'm so sorry for this. I'll be careful later. And take this as a warning.

hailongSun2000 commented 2 days ago

@darthscsi @teqdruid @seldridge @fabianschuiki @uenoku @dtzSiFive . I'm so sorry to bother you. Please help me to fix it.

hailongSun2000 commented 2 days ago

The latest commit history based on this(ce121a0a15404062ced9b560c3df53d52f00b1ee)

uenoku commented 2 days ago

I feel the PR is merged correctly with squash and merge. What is the issue specifically?

teqdruid commented 2 days ago

Yeah, I don't see the issue.

hailongSun2000 commented 2 days ago

When I merged this PR, I forgot to synchronize the commit history.

hailongSun2000 commented 2 days ago

I checked this comparison (https://github.com/llvm/circt/compare/e70dcc003a0558e94d6b127b9fbbed2dba0cf268..955f484183727c851e2607a6d2ecdb96bfc243ed). There are no changes since this commit(https://github.com/llvm/circt/commit/ce121a0a15404062ced9b560c3df53d52f00b1ee)

That is I lost four commits(750543553be30dcd0ac332faf59f61695504f7c2, e5b898206533f9bb3dd8b25d3ff1c900eeb53b6b, 609180aec34b4b1bc5fae17b31d0eb4b58b11d88, d8b0baade51436670ad45a3c103770960065dd22) in this PR(https://github.com/llvm/circt/pull/7216)

uenoku commented 2 days ago

It’s not a problem unless you don’t force push to a main branch directly. Since you merged a PR through GitHub it was automatically squashed and merge to main branch.

hailongSun2000 commented 2 days ago

Ok, I get it. But I'll be careful and avoid this mistake occurring again.

uenoku commented 2 days ago

It would be great to rebase a PR to top before merging but please don't worry too much even when you forget that. If CI gets broken unintentionally then we can always revert the commit :+1: Thank you for working hard on improving ImportVerilog flow :pray: