Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

Step 1. From your source root in the sipXecs source tree, select the proper source branch and run the following:

Code Block

cd OpenACD
git remote add upstream https://github.com/OpenACD/OpenACD.git
git fetch upstream
git branch -t upstream remotes/upstream/master
git checkout master
git merge upstream

Step 2. Change read-only git url to read/write. NOTE: For this step you need sipXecs commit rights.
Edit OpenACD/.git/config and change

Code Block

[remote "origin"]
        fetch = +refs/heads/*:refs/remotes/origin/*
        url = git://github.com/dhublerSIPfoundry/OpenACD.git

to

Code Block

[remote "origin"]
        fetch = +refs/heads/*:refs/remotes/origin/*
        url = git@github.com:dhublerSIPfoundry/OpenACD.git

Step 3. You've updated your local copy, but now you need to commit your changes to sipXecs project. These are the same general steps one would follow for submitting any fix to git submodules. This is a two step process: first pushing the changes to the git submodule itself then updating sipXecs to point to that new revision in the submodule.

Code Block

git push origin master
cd ..
git commit -m 'Updated lastest OpenACD' OpenACD
git push origin master

...