Git error: Pulling is not possible because you have unmerged files.

 When you have enough and enough with git, when the branch is ahead, and you want to discard everything locally. Run:

git fetch origin
git reset --hard origin/main 

Davinci Resolve on Ubuntu Intel N100

Download and install for the Free version:

cd ~/Downloads/
unzip ./DaVinci_Resolve_20.0.1_Linux.zip
chmod +x ./DaVinci_Resolve_20.0.1_Linux.run
sudo ./DaVinci_Resolve_20.0.1_Linux.run -i

sudo apt update
sudo apt install intel-opencl-icd

 

After going through all the steps, if it doesn't start open a terminal and start resolve with:

/opt/resolve/bin/resolve


if you get:

symbol lookup error: /lib64/libpango-1.0.so.0: undefined symbol: g_string_free_and_steal

Do the following

Code: Select all

sudo cp /usr/lib/x86_64-linux-gnu/libglib-2.0.so.0 /opt/resolve/libs/


if it still doesn't run and you get:

symbol lookup error: /opt/resolve/bin/../libs/libgdk_pixbuf-2.0.so.0: undefined symbol: g_task_set_static_name

Code: Select all

cd /opt/resolve/libs
sudo mkdir not_used
sudo mv libgio* not_used
sudo mv libgmodule* not_used


This has worked well for me - but I would also like to see BMD support Debian-based Linux distributions.

 

Development Workflow

1. Create a new branch from develop
git pull
   Replace:
   <branchStrategy> with feature, bugfix, release, hotfix
   <module> with backend, frontend, ml, docs, infrastructure
   git checkout -b <branchStrategy>/<module>-<description> develop
   Example: git checkout -b feature/backend-pdf-handler develop

2. Make your changes on the files, and upload to the repo.
   git add <file>
   Replace <type> with a Commit Message type, check the top table Commit Message Type.
   git commit -m '<type>: Add basic pdf handler.'
   Example: git commit -m 'feat: Add basic pdf handler.'
   git status
git push --set-upstream origin <branchStrategy>/<module>-<description>
   Example: git push --set-upstream origin feature/backend-pdf-handler

3. Write/update tests

4. Update documentation

5. Submit a pull request