Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Do not split up .framework folders between MacOS and Resources/_MacOS…#6606

Merged
montegoulding merged 1 commit into
livecode:develop-9.0from
trevordevore:tkd-bugfix-21398
Jul 5, 2018
Merged

Do not split up .framework folders between MacOS and Resources/_MacOS…#6606
montegoulding merged 1 commit into
livecode:develop-9.0from
trevordevore:tkd-bugfix-21398

Conversation

@trevordevore

Copy link
Copy Markdown
Contributor

… folder

@trevordevore

Copy link
Copy Markdown
Contributor Author

@montegoulding I was struggling to get the rebase to work properly so I just created a new PR.

@montegoulding

Copy link
Copy Markdown
Contributor

Ah... sorry @trevordevore rebase is often very confusing in GUI tools... I found the sourcetree rebase nearly impossible to use. On command line it's easy:

git rebase --onto=develop-9.0 develop

@montegoulding

Copy link
Copy Markdown
Contributor

@livecode-vulcan review ok 378b319

@montegoulding montegoulding added this to the 9.0.1-rc-1 milestone Jul 5, 2018
@livecode-vulcan

Copy link
Copy Markdown
Contributor

💙 review by @montegoulding ok 378b319

livecode-vulcan added a commit that referenced this pull request Jul 5, 2018
Do not split up .framework folders between MacOS and Resources/_MacOS…

… folder
@trevordevore

Copy link
Copy Markdown
Contributor Author

@montegoulding thanks for the tip. I only use the command line for rebasing but I didn’t realize I needed to use ‘onto’. I haven’t had to use that in my work before. I’ll use that next time.

@montegoulding

Copy link
Copy Markdown
Contributor

You use onto when you are rebasing from one branch to another.

@montegoulding montegoulding merged commit 1c8bbd7 into livecode:develop-9.0 Jul 5, 2018
@trevordevore trevordevore deleted the tkd-bugfix-21398 branch August 6, 2018 12:20
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants