Skip to content

Making Contributions

Shakeel Mohamed edited this page Oct 5, 2017 · 3 revisions

Syncing

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 -

  1. Click on the command line instructions as shown in the image above. The instructions are also explained below.
  2. Navigate to the current working directory of your working project on the command line.
  3. Run git remote to determine the remote name, if you have multiple remotes configured, you can run git remote -v to also see the URLs associated with each remote. The remote you want will have a URL containing github.com/zen-audio-player/zen-audio-player.github.io.
  4. Use git fetch upstream to fetch the branches and their respective commits from the upstream repository and store them locally. Commits to the upstream master branch are stored in a local branch upstream/master.
  5. Check out your branch using git checkout <your-branchname>.
  6. 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.
  7. Now you can again push your local changes using git push origin <your-branchname>.

Issues & Bug Reports

If you're seeing some unexpected behavior, please create an issue on GitHub with the following information:

  1. A screenshot
  2. Browser
  3. Browser version
  4. Operating System
Clone this wiki locally