You are reading a single comment by @fanoush and its replies.
Click here to read the full conversation.
-
Where does the changed code for (change #1) now live. Is it in my forked repository ?
yes, the PR is based on branch in your repo that you want to merge to upstram repo so any change in that branch goes to the PR. I think there is no other way for changes done by others so you need to pull that branch and possibly merge those changes back to your local repo before you can push more changes
Can anyone show me where the 'Update' button is on a github repo.
not sure I understand but there is sync button on the branch
1 Attachment
-
fanoush
I have some dumb questions with regards to github that I am hoping someone can straighten me out on.
PROBLEM #1
When I started developing on Bangle, I understood basic git commands but could
not find out how to update a fork of the master Bangle repo through the github website GUI. I looked in the docs but could not find out how once you had created a fork you could update it through the github website.
Everytime I made changes I had to create a new branch on github add my change so that I had a repo that was up to date and do a pull request. After a while I realised I could work as follows.
I cloned the BangleApps (call it upstream) repo to my github user account (my fork)
I then cloned my fork onto my ChromeBook linux setup using
git clone https://github.com/hughbarney/BangleApps.git. This is now my local repository.I update the Chromebook/BangleApps (local) using
git fetch upstreamwhere upstreamis setup using
git remote add upstream https://github.com/espruino/BangleApps.gitI merge in any changes using
git merge upstream/masterI make my changes and get my app working
when done I push it to my github account (the fork) using
git psh origin masterThis allows me to test the app will install through my own loader.
I then manually request a pull request through the github website to BangleApp
Now all this is because I could not figure out what the github website GUI actions are to update a fork after ot has got out of date.
So there must be a better way. Can anyone show me where the 'Update' button is on a github repo.
If you could speak in screenshots and I could not find a useful decription of how this is done.
PROBLEM 2
After doing a pull request - there seems to be a review process and someone else
changes your pull request (Change#1) and and then asks you to make some more changes.
Where does the changed code for (change #1) now live. Is it in my forked repository ?