-
Notifications
You must be signed in to change notification settings - Fork 181
Making Contributions
Shakeel Mohamed edited this page Oct 5, 2017
·
3 revisions
This issue arises when the master
branch of the upstream repository has been changed (i.e. new commits added) since you checked out a development branch. It can be resolved in the following manner -
- Click on the command line instructions as shown in the image above. The instructions are also explained below.
- Navigate to the current working directory of your working project on the command line.
- Run
git remote
to determine the remote name, if you have multiple remotes configured, you can rungit remote -v
to also see the URLs associated with each remote. The remote you want will have a URL containinggithub.com/zen-audio-player/zen-audio-player.github.io
. - Use
git fetch upstream
to fetch the branches and their respective commits from the upstream repository and store them locally. Commits to the upstreammaster
branch are stored in a local branchupstream/master
. - Check out your branch using
git checkout <your-branchname>
. - Merge the changes from upstream/master into your branch using
git merge upstream/master
. This syncs your branch with the upstream repository, without losing your local changes. - Now you can again push your local changes using
git push origin <your-branchname>
.
If you're seeing some unexpected behavior, please create an issue on GitHub with the following information:
- A screenshot
- Browser
- Browser version
- Operating System