#bookbrainz

monkey: ping

Hi Shubh !

I made some progress on the front-end part, basic layout is done (missing AC and few other fields)

Nice !

How did you get along with the rebase? Any progress from yesterday?

also PR is still messy after rebase thing :(

OK, let me have a look now.

I just finished what I think is the last piece for the Author Credits PR (ACs for Edition Groups, and AC merging validation)

Ah nice, just let me know if i can help in anyway :)

I wanted you to be able to focus on your project while I dealt with this one

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

Important ! To pull this new history you need to nuke your local history, since they now differ. http://stackoverflow.com/questions/14787776/ddg...

Of course, based on the stack overflow above, you'll need to target the correct branch

Let me know if you need a hand

just to be sure, in my case commands would be https://www.irccloud.com/pastebin/PagsUNIe/

Not quite

(one sec)

In your local repo directory, what does `git remote show origin` print out?

forked repo trit1n:bookbrainz

Specifically, is the `origin` `https://github.com/metabrainz/bookbrainz-site` or `https://github.com/tr1ten/bookbrainz-site`

Hmm later one

OK. So in this case, I myself pushed to your origin, i.e. tr1ten/bookbrainz-site

So the first command is going to be `git fetch origin`

hmm origin then

With the second command, we want to target the same origin, but this time the `uf-frontend` branch.

So it should be `git reset --hard origin/uf-frontend`

Unless I am mistaken somewhere.

Heads up: that will nuke your local history, so make sure you don't have anything unsaved

The silence is unnerving ! :p Did it work?

Yes it did!, thanks so much , was reading more about this rebase thing

Cool! I was worried for a sec :D

was feeling nervous about this rebase thing tbh but yeah it does seem useful now

very useful to adjust your commit history (merge commits, reword the message, etc.) before pushing it

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

if i'm not wrong, this would cause horrible bugs if later commits depend on prev one

By the time someone force pushed, the commit histories diverge completely. The commit SHAs will be different for what looks like the same commits.

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.

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 :)

Shubh: Sure thing! Today is a bank holiday here in Spain but I can look tomorrow