search

stevennt / myai.abn.khoj.old.abandon

[KHOJ fork] Your AI second brain. Get answers to your questions, whether they be online or in your own notes. Use online AI models (e.g gpt4) or private, local LLMs (e.g llama3). Self-host locally or use our cloud instance. Access from Obsidian, Emacs, Desktop app, Web or Whatsapp.
https://khoj.dev
GNU Affero General Public License v3.0
0 stars 0 forks source link

Merging commit failed #21

Closed stevennt closed 4 months ago

stevennt commented 4 months ago
image
stevennt commented 4 months ago

Step 1: From your project repository, check out a new branch and test the changes.

git checkout -b khoj-ai-master khoj.master git pull https://github.com/khoj-ai/khoj.git master Step 2: Merge the changes and update on GitHub.

git checkout khoj.master git merge --no-ff khoj-ai-master git push origin khoj.master

stevennt commented 4 months ago

My situation:

It says there are conflicts.

Give me the commands I can run in my repo to get the changes in my repo and to resolve conflicts if any?

stevennt commented 4 months ago

cd path/to/your/local/repo git remote add upstream https://github.com/khoj-ai/khoj.git git fetch upstream git checkout khoj.master git merge upstream/master

Resolve conflicts

git add path/to/resolved/file git commit -m "Merged upstream master into khoj.master and resolved conflicts" git push origin khoj.master

stevennt commented 4 months ago

git clone https://github.com/stevennt/myai.abn.khoj.git cd myai.abn.khoj

git remote add upstream https://github.com/khoj-ai/khoj.git

git fetch upstream

git checkout khoj.master

git merge upstream/master

Open the conflicting files in your text editor. Look for conflict markers (<<<<<<, =======, >>>>>>>) and edit the files to resolve the conflicts.

git commit -m "Merge upstream changes and resolve conflicts"

git push origin khoj.master