Skip to content

pull before push when finalizing eph git context - #91

Merged
grizz merged 3 commits into
mainfrom
git-eph-pull
Jul 17, 2026
Merged

grizz merged 3 commits into
mainfrom
git-eph-pull

Conversation

@vegu

@vegu vegu commented Mar 11, 2026

Copy link
Copy Markdown
Contributor

No description provided.

Resolve CHANGELOG conflicts by combining the fetch-cooldown (Added) and
pull-before-push (Fixed) entries. git.py auto-merged in disjoint regions.
Apply black to the fetch-cooldown error line (pre-existing lint issue from
main #90) so linting passes.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@grizz
grizz merged commit 131a9ac into main Jul 17, 2026
2 of 8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants