AeThex-Corporation/aethex-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve merge conflicts in build workflow file

Browse source 
Resolve add/add conflict in '.github/workflows/desktop-build.yml' during rebase operation by checking out '--ours' version and continuing.

Replit-Commit-Author: Agent
Replit-Commit-Session-Id: 9203795e-937a-4306-b81d-b4d5c78c240e
Replit-Commit-Checkpoint-Type: full_checkpoint
Replit-Commit-Event-Id: f59e76fc-0b28-4029-9347-25ff57288d23
Replit-Commit-Screenshot-Url: https://storage.googleapis.com/screenshot-production-us-central1/7c94b7a0-29c7-4f2e-94ef-44b2153872b7/9203795e-937a-4306-b81d-b4d5c78c240e/lX9tyiI
Replit-Helium-Checkpoint-Created: true
This commit is contained in:
sirpiglr 2025-12-05 23:48:08 +00:00
parent fd77157cdf
commit a6cad98e0c
1 changed files with 38 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
attached_assets/Pasted--workspace-git-pull-rebase-origin-main-From-https-githu_1764978472462.txt Normal file
View file

@ -0,0 +1,38 @@
~/workspace$ git pull --rebase origin main
From https://github.com/AeThex-Corporation/aethex-forge
* branch main -> FETCH_HEAD
Auto-merging .github/workflows/desktop-build.yml
CONFLICT (add/add): Merge conflict in .github/workflows/desktop-build.yml
error: could not apply 0ac2711... Update application to include desktop build and release configurations
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply 0ac2711... # Update application to include desktop build and release configurations
~/workspace$ git checkout --ours .github/workflows/desktop-build.yml
Updated 0 paths from the index
~/workspace$ git add .github/workflows/desktop-build.yml
~/workspace$ git add .github/workflows/desktop-build.yml
~/workspace$ git rebase --continue
fatal: no rebase in progress
~/workspace$ git status
On branch main
Your branch and 'origin/main' have diverged,
and have 12 and 1 different commits each, respectively.
(use "git pull" if you want to integrate the remote branch with yours)
nothing to commit, working tree clean
~/workspace$ git pull --rebase origin main
From https://github.com/AeThex-Corporation/aethex-forge
* branch main -> FETCH_HEAD
Auto-merging .github/workflows/desktop-build.yml
CONFLICT (add/add): Merge conflict in .github/workflows/desktop-build.yml
error: could not apply 0ac2711... Update application to include desktop build and release configurations
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply 0ac2711... # Update application to include desktop build and release configurations
~/workspace$