Skip to content

Add hello, and reword the README - #1

Open
initialcommit-io wants to merge 4 commits into
mainfrom
feature
Open

initialcommit-io wants to merge 4 commits into
mainfrom
feature

Conversation

@initialcommit-io

Copy link
Copy Markdown
Contributor

Woohoo

@github-actions

github-actions Bot commented Oct 10, 2026 •

Copy link
Copy Markdown

🟠 Caution · git merge feature

Brings in 4 commit(s) from feature (merge commit).

What happens

How to undo it

  • It stops at the conflict without making a merge commit: git merge --abort puts everything back
  • Once you resolve and commit it, undo the merge with: git reset --hard ORIG_HEAD (back to 4608886)

Warnings

  • Merge WILL conflict in 1 file(s): README.md
Commit graph
* 366622c (origin/feature, feature) Say hello one last time               <- INCOMING
* cd012ab Say hello once more                                             <- INCOMING
* a128caa Say hello again                                                 <- INCOMING
* 833c51c Add hello, and reword the README                                <- INCOMING
| * 4608886 (HEAD -> main, origin/main) Run the git-sim check on pull...
| * 95de6d9 Describe the repo
|/
* 472c203 Add the git-sim workflow
* 38466ef Initial commit

The interactive before / after graph is attached to this run as the artifact git-sim-pr-1.

Computed from the repository by git-sim; nothing was merged or changed.

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.

1 participant