Discussion
Loading...

Post

Log in
  • About
  • Code of conduct
  • Privacy
  • Users
  • Instances
  • About Bonfire
Andrew Kelley
Andrew Kelley
@andrewrk@mastodon.social  ·  activity timestamp 2 hours ago

big fan of @Codeberg manual merging copy pasteable command line instructions. way better than github's

plus that "manually merged" button? mmm! 🧑‍🍳 😘 👌

Red manually merged button

View command line instructions
Checkout
From your project repository, check out a new branch and test the changes.
git fetch -u https://codeberg.org/jeffective/zig jeff/libzigc-acosf:jeffective-jeff/libzigc-acosf
git switch jeffective-jeff/libzigc-acosf
Merge
Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.
git switch master
git merge --no-ff jeffective-jeff/libzigc-acosf
git push origin master
Red manually merged button View command line instructions Checkout From your project repository, check out a new branch and test the changes. git fetch -u https://codeberg.org/jeffective/zig jeff/libzigc-acosf:jeffective-jeff/libzigc-acosf git switch jeffective-jeff/libzigc-acosf Merge Merge the changes and update on Forgejo. Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards. git switch master git merge --no-ff jeffective-jeff/libzigc-acosf git push origin master
Red manually merged button View command line instructions Checkout From your project repository, check out a new branch and test the changes. git fetch -u https://codeberg.org/jeffective/zig jeff/libzigc-acosf:jeffective-jeff/libzigc-acosf git switch jeffective-jeff/libzigc-acosf Merge Merge the changes and update on Forgejo. Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards. git switch master git merge --no-ff jeffective-jeff/libzigc-acosf git push origin master
  • Copy link
  • Flag this post
  • Block
Andrew Kelley
Andrew Kelley
@andrewrk@mastodon.social replied  ·  activity timestamp 2 hours ago

@Codeberg sorry I should probably have said @forgejo

  • Copy link
  • Flag this comment
  • Block

bonfire.cafe

A space for Bonfire maintainers and contributors to communicate

bonfire.cafe: About · Code of conduct · Privacy · Users · Instances
Bonfire social · 1.0.2-alpha.27 no JS en
Automatic federation enabled
Log in
  • Explore
  • About
  • Members
  • Code of Conduct