Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge the history of Solidus PayPal Braintree into this repository #92

Closed
kennyadsl opened this issue Nov 29, 2022 · 0 comments · Fixed by #98
Closed

Merge the history of Solidus PayPal Braintree into this repository #92

kennyadsl opened this issue Nov 29, 2022 · 0 comments · Fixed by #98
Assignees
@gsmendoza
Milestone
v2.0

Comments

@kennyadsl
Copy link
Member

kennyadsl commented Nov 29, 2022 •
edited by gsmendoza
Loading

Goal

We want to replace the SolidusBraintree code with that from the Solidus PayPal Braintree, while at the same time keeping the commits of both repos.

Implementation

Consider adding the remote for SPB then merge with a merge-strategy that discards all the old code, something like:

git remote add solidus_paypal_braintree git@github.com:solidusio/solidus_paypal_braintree.git
git reset --hard solidus_paypal_braintree/master
git merge origin/master --strategy ours --allow-unrelated-histories
This was referenced Jan 6, 2023
Closed
Closed
@gsmendoza gsmendoza self-assigned this Dec 2, 2022
@elia elia pinned this issue Dec 6, 2022
This was referenced Dec 6, 2022
Closed
Closed
Closed
@elia elia added this to the v2.0 milestone Dec 6, 2022
@gsmendoza gsmendoza mentioned this issue Dec 8, 2022
Closed
4 tasks
gsmendoza added a commit to gsmendoza/solidus_braintree that referenced this issue Dec 28, 2022
@gsmendoza
Merge remote-tracking branch 'origin/master' into gsmendoza/92-merge-…
71c63b8 
…solidus-paypal-braintree

Fixes solidusio#92.

Implement as follows:

```
git remote add solidus_paypal_braintree git@github.com:solidusio/solidus_paypal_braintree.git
git reset --hard solidus_paypal_braintree/gsmendoza/92-merge-solidus-paypal-braintree
git merge origin/master --strategy ours --allow-unrelated-histories
```
@gsmendoza gsmendoza mentioned this issue Dec 28, 2022
Closed
3 tasks
gsmendoza added a commit to gsmendoza/solidus_braintree that referenced this issue Jan 5, 2023
@gsmendoza
Merge remote-tracking branch 'origin/master' into gsmendoza/92-merge-…
9efcab7 
…solidus-paypal-braintree

Resolves solidusio#92.

Implemented with:

```
git remote add solidus_paypal_braintree git@github.com:solidusio/solidus_paypal_braintree.git
git reset --hard solidus_paypal_braintree/gsmendoza/336-update-the-extension-namespace-to-solidus-braintree
git merge origin/master --strategy ours --allow-unrelated-histories
```
@gsmendoza gsmendoza unpinned this issue Jan 6, 2023
@gsmendoza gsmendoza mentioned this issue Jan 6, 2023
Closed
gsmendoza added a commit to gsmendoza/solidus_braintree that referenced this issue Jan 6, 2023
@gsmendoza
Add empty changelog sections for 1.1.0 and 1.2.0
2c2e366 
We're no longer filling the sections for these two versions since the
changelog will eventually be replaced by SolidusPaypalBraintree's
changelog in solidusio#92.
gsmendoza added a commit that referenced this issue Jan 6, 2023
@gsmendoza
Add empty changelog sections for 1.1.0 and 1.2.0
bf94f50 
We're no longer filling the sections for these two versions since the
changelog will eventually be replaced by SolidusPaypalBraintree's
changelog in #92.
gsmendoza added a commit that referenced this issue Jan 6, 2023
@gsmendoza
Merge remote-tracking branch 'origin/master' into gsmendoza/92-merge-…
e0e5802 
…solidus-paypal-braintree

Resolves #92.

Implemented with

```
git remote add solidus_paypal_braintree git@github.com:solidusio/solidus_paypal_braintree.git
git reset --hard solidus_paypal_braintree/master
git merge origin/master --strategy ours --allow-unrelated-histories
```
This was referenced Jan 6, 2023
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@gsmendoza gsmendoza

Labels
None yet
Projects
None yet
Milestone
v2.0
3 participants
@elia @gsmendoza @kennyadsl