Home

Welcome to the XRT wiki!

GitHub Setup

• Create a fork of https://github.com/Xilinx/XRT.git using XRT GitHub page. This fork will be called origin in git parlance. upstream refers to the location where you forked from. It will be something like "https://github.com/<username>/XRT.git"
• Clone the forked repository to local server : git clone https://github.com/<username>/XRT.git
• Configure your git remote : https://help.github.com/articles/configuring-a-remote-for-a-fork/
• Here is an example

$ git remote -v

origin https://user@github.com/user/XRT.git (fetch) origin https://user@github.com/user/XRT.git (push) upstream https://user@github.com/Xilinx/XRT.git (fetch) upstream https://user@github.com/Xilinx/XRT.git (push)

GitHub Development Model

• Make changes; test changes; commit to your local repository
• <Optional> : Squash your change history if you wish by rebase your changes: git rebase -i origin/master
• push the changes to your fork on GitHub into the master branch. git push origin master
• Go back to GitHub page and create Pull Request. This will show up on upstream at https://github.com/Xilinx/XRT.git
• Admins review the change and commit them to upstream
• Sync your origin with latest changes in upstream for master branch git pull --rebase upstream master git push origin master