Hello.
I believe that you are not getting the correct answer because the question
is not clear.
What I think that you want to do is get your copy up to date, being it a
branch or master. There is this github page that you should read, although
I will explain it here too:
https://help.github.com/articles/syncing-a-fork/
Having "upstream" as the mixxx repository
Having a fork of master on your github repository
Having branches on your github repository:
First, ensure that your local clone of your repository knows where the
mixxx repository is. To do so, look here:
https://help.github.com/articles/configuring-a-remote-for-a-fork
Then the procedure is:
$ git fetch upstream
$ git checkout master
$ git merge upstream/master
The first command tells git to go and look on the repository configured as
upstream (which you should have configured as I've told above... You can
choose a different name).
The second command tells git to change your working copy to the master.
The third command tells git to merge what is on upstream/master ( which is
supposed to be mixxx master), with your working copy (which is supposed to
be your master).
Depending on the changes, this can be a fast-forward, or you might need to
solve conflicts.
Conflicts are solved by manually editing the files, and once the conflict
has been resolved, git add it ( This is explained here:
https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/
)
Once you have your master merged, you should push it to github. If you
needed to solve conflicts, you willl need to make a commit too.
($ git commit -m "merge to get up to date")
$ git push
Now, in order to update your branches, you can do so from your master
branch.
$ git checkout my-other-branch
$ git merge master
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Get Mixxx, the #1 Free MP3 DJ Mixing software Today
http://mixxx.org
Mixxx-devel mailing list
Mixxx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mixxx-devel
