pyflow | run dense optical flow with python wrapper | Computer Vision library

The proper way to use python-shell-send-buffer is to run it from a buffer of Python code; Emacs will then send the contents of that buffer to the Python REPL you started with run-python.

Don't run this command in the run-python buffer (*Python*) itself; it doesn't make any sense to submit that buffer's contents to Python as code.

To quickly demonstrate how this works,

• Create a buffer demo.py and type some Python code into it.

This is expected behavior. Git isn't doing anything at all to files it ignores. That means if .pyc files are created while you have one branch open, then you switch to another branch, nothing will happen to the .pyc files, because all you've done is switch git branches, and those files are ignored by git.

If you like, you can add a post-checkout hook that deletes all pycache directories and .pyc files each time you check out a branch.

First, note that .gitignore content itself never has any direct effect on a merge. That is because git merge merges the contents of commits, which are already committed and cannot be changed. They have the files that they have. No power on Earth, or anywhere else, can change them. Your git merge is merging some existing commits, in preparation for making a new commit.

I have run git rm '*.pyc' in both files ...

Do you mean "in both commits"? "In both files" makes little sense here.

I don't recall renaming or deleting any venv/lib/* files.

If venv/lib contained *.pyc files, and you ran the above git rm, you would remove those *.pyc files from both your work-tree and Git's index. Once the files are out of Git's index, then the existing *.pyc entry in an existing .gitignore can take effect, preventing future *.pyc files from entering Git's index via your work-tree. A subsequent commit would then lack those *.pyc files.

I'll just look at the first conflict here, and split up long lines for posting purposes only:

Adding a line to .gitignore does not stop that file from being tracked by git - it just means that changes to it won't show up in git status / git diff and similar. To remove it from git, you need to run git rm name-of-file . However, this will also delete the actual file, so to avoid losing data, the best approach is:

• make a copy of db.sqlite3
• git rm db.sqlite3
• move your copy of the file back to the original filename
• commit the change to git

Then, on your live server:

• make a copy of db.sqlite3
• git pull
• move your copy of the file back to the original filename