I made some progress on the front-end part, basic layout is done (missing AC and few other fields)
2022-06-06 15741, 2022
monkey
Nice !
2022-06-06 15756, 2022
monkey
How did you get along with the rebase? Any progress from yesterday?
2022-06-06 15705, 2022
Shubh
also PR is still messy after rebase thing :(
2022-06-06 15719, 2022
monkey
OK, let me have a look now.
2022-06-06 15749, 2022
monkey
I just finished what I think is the last piece for the Author Credits PR (ACs for Edition Groups, and AC merging validation)
2022-06-06 15757, 2022
Shubh
Ah nice, just let me know if i can help in anyway :)
2022-06-06 15745, 2022
monkey
I wanted you to be able to focus on your project while I dealt with this one
2022-06-06 15702, 2022
monkey
OK Shubh I've cleaned up the commit history (I did an interactive rebase to `drop` the commits we didn't want, and then force-pushed which rewrites the history).
In your local repo directory, what does `git remote show origin` print out?
2022-06-06 15733, 2022
Shubh
forked repo trit1n:bookbrainz
2022-06-06 15737, 2022
monkey
Specifically, is the `origin` `https://github.com/metabrainz/bookbrainz-site` or `https://github.com/tr1ten/bookbrainz-site`
2022-06-06 15759, 2022
Shubh
Hmm later one
2022-06-06 15726, 2022
monkey
OK. So in this case, I myself pushed to your origin, i.e. tr1ten/bookbrainz-site
2022-06-06 15743, 2022
monkey
So the first command is going to be `git fetch origin`
2022-06-06 15754, 2022
Shubh
hmm origin then
2022-06-06 15715, 2022
monkey
With the second command, we want to target the same origin, but this time the `uf-frontend` branch.
2022-06-06 15733, 2022
monkey
So it should be `git reset --hard origin/uf-frontend`
2022-06-06 15746, 2022
monkey
Unless I am mistaken somewhere.
2022-06-06 15718, 2022
monkey
Heads up: that will nuke your local history, so make sure you don't have anything unsaved
2022-06-06 15728, 2022
monkey
(on this branch)
2022-06-06 15739, 2022
monkey
The silence is unnerving ! :p Did it work?
2022-06-06 15716, 2022
Shubh
Yes it did!, thanks so much , was reading more about this rebase thing
2022-06-06 15734, 2022
monkey
Cool! I was worried for a sec :D
2022-06-06 15707, 2022
Shubh
was feeling nervous about this rebase thing tbh but yeah it does seem useful now
2022-06-06 15743, 2022
monkey
very useful to adjust your commit history (merge commits, reword the message, etc.) before pushing it
2022-06-06 15743, 2022
monkey
As much as possible we try to avoid doing force-pushes on a branch where other people work (because as you've seen it requires nuking you local commit history after a force push) but in some cases like today we can't avoid it if we want to keep the commit history clean
2022-06-06 15715, 2022
Shubh
if i'm not wrong, this would cause horrible bugs if later commits depend on prev one
2022-06-06 15705, 2022
monkey
By the time someone force pushed, the commit histories diverge completely. The commit SHAs will be different for what looks like the same commits.
2022-06-06 15705, 2022
monkey
So you would have to save your local commits to a new branch, nuke your history from the force-pushed branch, and then try to reapply your saved commits to the new history. Needless to say it can get tricky.
2022-06-06 15739, 2022
Shubh
monkey: when you get time, can you please have a quick look at the form, would love to hear your suggestions on how i can improve overall code quality :)
2022-06-06 15711, 2022
monkey
Shubh: Sure thing! Today is a bank holiday here in Spain but I can look tomorrow
