Birdman's github thread

[birdman]

Point 1
If you have already made changes to dev and master branches in your fork, save the changed files elsewhere.
START AGAIN.
Fork project
Create new branch
Re-add the changed files to your new branch of your fork (copy of project).

That's the current state I am in.
The problem is that once I've created my own fork there seems to be no way to update the dev and master branches (using the Web interface) to the latest state of the OpenVix master (which is what I may well need to do in order to create my next branch from Dev before submitting the next PR).

[abu baniaz]

Can we please keep your questions in this thread?

I am afraid I have to disagree with your statement. You cannot have started again (unless you have not been able to update for last 11 days). You still have the EPG-fixes branch

[twol]

That's the current state I am in.
The problem is that once I've created my own fork there seems to be no way to update the dev and master branches (using the Web interface) to the latest state of the OpenVix master (which is what I may well need to do in order to create my next branch from Dev before submitting the next PR).

Do you use git commands from a Terminal?
As once you know them it is really simple to keep your fork in sync with the OpenViX branches
If you don,t I can post the few commands you need to keep your fork and its branches in sync

[birdman]

Do you use git commands from a Terminal?

Yes. I also edit the files in a terminal...I'm very old-school.

As once you know them it is really simple to keep your fork in sync with the OpenViX branches
If you don,t I can post the few commands you need to keep your fork and its branches in sync

I've never got that to work either (could be related?) so please send me what you have.

[twol]

I am assuming that most of your changes will be against Dev branch.
Assuming that you have cloned to your PC, then cd to the directory and enter:
git remote -v

For my main Git repository the response is :
origin https://github.com/TwolDE/TwolViX.git (fetch)
origin https://github.com/TwolDE/TwolViX.git (push)
upstream https://github.com/OpenVIX/enigma2.git (fetch)
upstream https://github.com/OpenVIX/enigma2.git (push)

I would expect at least origin to be set in yours so to set up upstream, enter:
git remote add upstream https://github.com/OpenVIX/enigma2.git

to sync with Dev:
git checkout Dev (puts you on your Dev branch)
git fetch upstream (normally you will see entries for Dev & master( after a Vix merge to master from Dev)
git merge upstream/Dev
git push origin Dev
... and your Dev branch should be in sync.

git checkout -b newbranch Dev
puts you on a new branch based on Dev
make your changes and then Pull. Then on your github delete the branch
locally issue:-
git branch -D newbranch ... will force delete of local branch.

[birdman]

to sync with Dev:
git checkout Dev (puts you on your Dev branch)
git fetch upstream (normally you will see entries for Dev & master( after a Vix merge to master from Dev)

Hmmm...perhaps not checking out Dev before fetching upstream is where I've been going wrong. I sort-of assumed this affected the whole git, rather than a specific branch.

EDIT: and that all seems to work. When I get back to the web page it now says:
This branch is even with OpenViX: Dev.
(and the same for master...)

[twol]

Hmmm...perhaps not checking out Dev before fetching upstream is where I've been going wrong. I sort-of assumed this affected the whole git, rather than a specific branch.

You can issue a git pull ... but I like to know what I am updating ... especially as (although people will say don‘t do this!!) my master is really an updated Dev (contains all my changes plus Dev) .. so I actually pull Dev into my master!!!
Another reason I have a separate fork that is pure ViX.