Regarding work around of bug in Windows Build

[Ankriti Sachan]

Hi !

I am a newcomer here.

While trying to build the code, I got some error for which I was suggested this solution to look at - https://github.com/mit-cml/appinventor-sources/pull/1556.

But I don't know how to proceed with this.

Please help me out.

Thank you.

[Evan Patton]

If you're at the command line, you should be able to do the following:

git remote add upstream https://github.com/mit-cml/appinventor-sources.git

git fetch upstream refs/pull/1556/head:pull/1556

git merge pull/1556

Regards,

Evan

[Ankriti Sachan]

Thanks a lot. That worked.

[Ankriti Sachan]

Hi Evan,

I used the above solution to fix my build issues in windows.

When will the above PR #1556 get merged to the master? 

I want to submit a PR for the issue #1520, but I guess that will show two commits from me (one from the used PR and one from my own changes) which is not right. Please correct me if I am wrong. I am still a beginner with git.

So, should I wait for PR at #1556 to get merged? Or is there another workaround?

[Evan Patton]

Hi Ankriti,

If you have your change on a branch and its just one commit, you could do the following:

git checkout ucr

git pull

git checkout BRANCH

git rebase HEAD~1 --onto ucr

This should move your commit onto the latest version of the ucr* branch. You should then be able to submit this branch as a pull request with ucr as the base branch.

Cheers,

Evan

* ucr is the branch for any changes that affect the companion behavior.