Ask Your Question

Revision history [back]

click to hide/show revision 1
initial version
pip install -U askbot

-U switch is for update.

If you used git, then something like:

git fetch origin master:master-updated
git checkout master
git merge master-updated

Assuming that the remote repository from where askbot is brought is called "origin" and that the main branch is called "master"., after the merge in may be necessary to resolve conflicts in the case your edits overlapped with the ones in the project.

pip install -U askbot

-U switch is for update.

If you used git, then something like:

git fetch origin master:master-updated
git checkout master
git merge master-updated

Assuming that the remote repository from where askbot is brought is called "origin" and that the main branch is called "master"., after the merge in may be necessary to resolve conflicts in the case your edits overlapped with the ones in the project.project, then

git add <fixed files>
git commit -m 'merged with the development repository'