Rebase with upstream - Githubissues

mozilla / wp-calypso

INACTIVE - http://mzl.la/ghe-archive - The new JavaScript- and API-powered WordPress.com

https://developer.wordpress.com/calypso/

GNU General Public License v2.0

4 stars 10 forks source link

Rebase with upstream #40

Closed cadecairos closed 8 years ago

cadecairos commented 8 years ago

We'll need to verify I didn't break anything in this merge, becuase I hit several dozen merge conflicts and tried to resolve them as best as I could.

cc/ @mmmavis

mmmavis commented 8 years ago

I wonder what's easier here:

revert all the code changes @alicoding & I introduced in our fork, rebase it with upstream, Ali and I re-implement the features to the our up-to-date fork (through 2 separate PRs)

I submit a PR against @cadecairos 's rebase-icus-maximus to fix merge conflict?

I personally prefer option 1 but would like to know what @alicoding thinks (note that we haven't merged ur PR https://github.com/mozilla/wp-calypso/pull/38 yet)

cadecairos commented 8 years ago

It's important that we expedite this work, as it's blocking https://github.com/MozillaFoundation/plan/issues/776

alicoding commented 8 years ago

I feel like revert and reapply our patches might be easier since we know exactly what files we really worked on, or we might need to find a way to override them in a separate patch that way we can always put our stuff on top of these commits? I don't know how @humphd can maintain with Brackets so well, but I know is not easy at all.

mmmavis commented 8 years ago

I'll see how complicated it is to fix the merge conflicts first. Otherwise we'll have to go for option 1 (revert & reimplement).

Will get to this today.

cadecairos commented 8 years ago

Thanks Mavis! Let me know if you need anything on my end!

mmmavis commented 8 years ago

@cadecairos

Okay, so fixing merge conflicts introduced in 2000 commits is more painful than I expected. :mask: It seems like within those 2000 commits Automattic added functions that could be useful for our customization work.

So, I'm gonna go for option 1 then, here's what I'm gonna do

create a new branch new-master based on the current Automattic/master
re-implement https://github.com/mozilla/wp-calypso/issues/28 (add mozmaker-templates to Calypso) and submit a PR against new-master
have @alicoding to quickly review it
merge my PR into new-master
kill the current out of date master and make new-master the master branch
@alicoding adds Preview feature back to the up-to-date master branch

I think the above should cover all the changes we have made in our fork. (see the commit history screencap below)

fireshot capture 49 - commits mozilla_wp-c_ - https___github com_mozilla_wp-calypso_commits_master

mmmavis commented 8 years ago

let me know if my previous comment makes sense to you @cadecairos @alicoding

i'll try to finish my part by noon tomorrow (fingers crossed!)

cadecairos commented 8 years ago

Thank you for digging into this problem, you rock!

mmmavis commented 8 years ago

Hey @cadecairos I think we can close this PR now? master should be fairly up-to-date with upstream now.

cadecairos commented 8 years ago

yeah, this was dealt with