Skip to content

Fix merge conflicts with dev branch #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Draft
wants to merge 153 commits into
base: feature/status-bar-git-head
Choose a base branch
from
Draft

Fix merge conflicts with dev branch #1

wants to merge 153 commits into from

Conversation

agileandy
Copy link
Owner

This PR resolves the merge conflicts between the feature/status-bar-git-head branch and the dev branch.

Changes Made

  • Resolved merge conflicts in README.md by keeping the main repository's README content
  • Preserved all the feature changes that add git head information to the status bar

Testing

The changes have been tested to ensure that:

  1. The README.md file is properly resolved
  2. The git head information feature works as intended

After merging this PR, the feature/status-bar-git-head branch should be ready to be merged into the dev branch of the main repository.

@agileandy can click here to continue refining the PR

thdxr and others added 30 commits July 11, 2025 20:33
@thdxr
docs: add model docs
0130190
@thdxr
switch global config to ~/.config/opencode/opencode.json
1729c31
@thdxr
fix issue preventing things from working when node_modules or package…
1254f48 
….json present in ~/
@thdxr
share page hide step-finish events
5c3d490
@thdxr
fix share page timestamps
aadca50
@actions-user
ignore: update download stats 2025-07-12
fd4648d
@muzzlol
feat: add more ignore patterns to the ls tool (sst#913)
9aa0c40
@thdxr
fix packages being reinstalled on every start
17fa8c1
@actions-user
ignore: update download stats 2025-07-13
d465f15
@fwang
wip: github actions
7361a02
@rekram1-node
Fix: title generation (sst#949)
bb28b70
@jhrudden
fix: deduplicate command suggestions (sst#934)
f04a5e5
@thdxr
wip: mcp
91f8477
@thdxr
ci: github action
177bfed
@opencode-agent @thdxr
Added sharing config with auto/disabled options (sst#951)
736396f 
Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com>
Co-authored-by: thdxr <thdxr@users.noreply.github.com>
@thdxr
Part data model (sst#950)
90d6c4a
@thdxr
fix type error
73d54c7
@thdxr
fix missing tokens
53bb6b4
@thdxr
ci
67e9bda
@thdxr
get rid of cli markdown dep
06554ef
@dnouri
Fix clipboard on Wayland systems (sst#941)
139d6e2 
Co-authored-by: Daniel Nouri <daniel@redhotcar>
@rekram1-node
fix: file command visual bug (sst#959)
052a1e7
@actions-user
ignore: update download stats 2025-07-14
457755c
@almirsarajcic
Explain usage of external references in AGENTS.md (sst#965)
1f4de75
@Munawwar
feat: ctrl+left arrow / ctrl+right arrow key support (sst#969)
7b8b4cf
@almirsarajcic
Fix failing git hooks (sst#966)
4192d7e
@nhamilton1
feat: ability to create new session from session dialog (sst#920)
8d0350d
@adamdotdevin
fix(tui): find dialog bg color
229a280
@adamdotdevin
fix(tui): build and bg color
a53d2ea
@thdxr
fix init command and escape to cancel
31e0326
timoclsn and others added 30 commits July 16, 2025 16:08
@timoclsn
docs(share): add explicit manual share mode (sst#1074)
3c6c2bf
@timoclsn
feat(tui): remove sharing info from session header when sharing is di…
60b55f9 
…sabled (sst#1076)
@timoclsn
fix(tui): user defined ctrl+z should take precedence over suspending (s…
91ad64f 
…st#1088)
@rekram1-node
fix: message error centering (sst#1085)
3ce3ac8
@timoclsn
feat(tui): remove share commands from help if sharing is disabled (ss…
a493aec 
…t#1087)
@drottsgard
feat(tui): highlight current session in sessions modal (sst#1093)
20cb7a7
@actions-user
ignore: update download stats 2025-07-17
2051312
@rekram1-node
tweak: allow mcp servers to include headers (sst#1096)
a1fdede
@ItsWendell
feat: support AWS_BEARER_TOKEN_BEDROCK for amazon bedrock provider au…
e681d61 
…toloading (sst#1094)
@thdxr
only enable ruff if it seems to be used
23c3052
@scaryrawr
Update to a customized beast mode v3 for opencode. (sst#1109)
99b9390
@monotykamary
fix(tui): ensure viewport scrolls to bottom on new messages (sst#1110)
81c88cc
@rekram1-node
tweak: fix [object Object] in logging (sst#1114)
edfea03
@rekram1-node
tweak: remove needless resorting (sst#1116)
571aeaa
@timoclsn
feat(tui): parse for file attachments when exiting EDITOR (sst#1117)
df33143
@adamdotdevin
fix: model cost overrides
9964d8e
@yihuikhuu
fix: \{return} should be replaced with new line on all lines (sst#1119)
46c246e
@actions-user
ignore: update download stats 2025-07-18
c8321cf
@actions-user
ignore: update download stats 2025-07-18
6470243
@thdxr
message rendering performance improvements
c952e9a
@thdxr
wip: optional IDs in api (sst#1128)
d56dec4
@adamdotdevin
feat(tui): simpler layout, always stretched
611854e
@opencode-agent @thdxr
Added install dir priority & user feedback (sst#1129)
01e7dc2 
Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com>
Co-authored-by: thdxr <thdxr@users.noreply.github.com>
@timoclsn
feat(config): make small model configurable (sst#1030)
18abcab
@rekram1-node
fix: func called before definition (sst#1134)
5c9d191
@necaris
feat(provider): add Gemini tool schema sanitization (sst#1132)
f1da70b
@mybuddymichael
docs: Clarify MCP config instructions (sst#1026)
132e26d
@thdxr
ci: rollback install script
c87a746
@CodinCat
fix table heading rendering (sst#1138)
1676f8b
@openhands-agent
Resolve merge conflicts in README.md
4d83e1b
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

Copilot code review Copilot Awaiting requested review from Copilot Copilot will automatically review once the pull request is marked ready for review

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.