Skip to content
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.

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

Add "commit goes here" section #7389

Merged
merged 4 commits into from
Feb 25, 2025
Merged

Add "commit goes here" section #7389

merged 4 commits into from
Feb 25, 2025

Conversation

mtsgrd
Copy link
Contributor

@mtsgrd mtsgrd commented Feb 24, 2025


This is part 1 of 2 in a stack made with GitButler:

Copy link

vercel bot commented Feb 24, 2025

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
gitbutler-components ✅ Ready (Inspect) Visit Preview 💬 Add feedback Feb 25, 2025 11:29pm
gitbutler-web ✅ Ready (Inspect) Visit Preview 💬 Add feedback Feb 25, 2025 11:29pm

@mtsgrd
Copy link
Contributor Author

mtsgrd commented Feb 24, 2025

@PavelLaptev I have some work left, but the navigation stuff wrt to committing works here if you want to poke at it.

image

@mtsgrd
Copy link
Contributor Author

mtsgrd commented Feb 25, 2025

@Byron at the moment I can only commit changes to a specific location in the top branch, otherwise it fails as seen in this screenshot:
image

@Byron
Copy link
Collaborator

Byron commented Feb 25, 2025

Thanks for reeling me in. I did take a quick look and used the but-cli to amend to each of the commits that were referenced by named references in this setup:

Screenshot 2025-02-25 at 20 26 45

Then I inserted them below the tip of each branch, and besides ref-rewriting being unaware of the the 'bucket' nature of references, it seemed to have worked.

Screenshot 2025-02-25 at 20 33 20

So the next step of debugging would be to use the code in this branch, but I will do that tomorrow.

@mtsgrd
Copy link
Contributor Author

mtsgrd commented Feb 25, 2025

That's strange, and now I can't reproduce..

@mtsgrd mtsgrd marked this pull request as ready for review February 25, 2025 23:46
@mtsgrd mtsgrd merged commit 30a7918 into master Feb 25, 2025
23 checks passed
@mtsgrd mtsgrd deleted the commit-goes-here branch February 25, 2025 23:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
@gitbutler/desktop rust Pull requests that update Rust code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants