Mastodon

Mark Nichols (LGBTQIA+ Ally)Starting Monday off with a nasty Git merge conflict and some rebase loop hell. Because why not.<a href="https://hachyderm.io/tags/Git" class="mention hashtag" rel="nofollow noopener" target="_blank">#Git</a> <a href="https://hachyderm.io/tags/GitRebase" class="mention hashtag" rel="nofollow noopener" target="_blank">#GitRebase</a>

Xanatos :godot:I just got the first practical usage of using git interactive rebase.I did edited multiple files and did need to reverse one of them already committed. I used an interactive rebase to edit the commit, unstaged everything, staged the file required and committed them once again. Restored the file I want to reset and completed the rebase. That was nice.<a href="https://mastodon.gamedev.place/tags/Git" class="mention hashtag" rel="nofollow noopener" target="_blank">#Git</a> <a href="https://mastodon.gamedev.place/tags/GitRebase" class="mention hashtag" rel="nofollow noopener" target="_blank">#GitRebase</a> <a href="https://mastodon.gamedev.place/tags/VersionControl" class="mention hashtag" rel="nofollow noopener" target="_blank">#VersionControl</a> <a href="https://mastodon.gamedev.place/tags/Developers" class="mention hashtag" rel="nofollow noopener" target="_blank">#Developers</a>

Tomas Tomecek`git rebase -i --rebase-merges` allows you to recreate merge commits in the history; absolutely mind blowingI hope I'll never use it.<a href="https://fosstodon.org/tags/git" class="mention hashtag" rel="nofollow noopener" target="_blank">#git</a> <a href="https://fosstodon.org/tags/GitRebase" class="mention hashtag" rel="nofollow noopener" target="_blank">#GitRebase</a>

clacke: exhausted pixie dream boy 🇸🇪🇭🇰💙💛<a href="https://merveilles.town/users/raboof" class="u-url mention" rel="nofollow noopener" target="_blank">@raboof</a> Oh, nice!<blockquote>> the break command (added in Git 2.20)</blockquote> Sweet! I've been using the trick originally described, putting a dummy edit after the merge and then resetting back to the merge, for years!I absolutely love --rebase-merges and use it many times per day to build and keep track of multiple parallel PRs.<a href="https://libranet.de/search?tag=git" class="mention hashtag" rel="nofollow noopener" target="_blank">#git</a> <a href="https://libranet.de/search?tag=GitRebase" class="mention hashtag" rel="nofollow noopener" target="_blank">#GitRebase</a> <a href="https://libranet.de/search?tag=GitRebaseInteractive" class="mention hashtag" rel="nofollow noopener" target="_blank">#GitRebaseInteractive</a>

Nathan Manceaux-PanotIt's still far from finished, but please welcome Bluebird! A Mac app for rewriting git history extremely quickly.Reorder commits, amend old ones and fixup any two—with just a drag-and-drop or a couple of keystrokes. Never slow down to save workdir changes—they're preserved automatically—and ⌘Z anything, even conflict resolutions. It's direct manipulation for git rebase! No special mode needed.I still have a lot to do, but boyyy is the app starting to feel useful 😊<a href="https://mas.to/tags/macos" class="mention hashtag" rel="nofollow noopener" target="_blank">#macos</a> <a href="https://mas.to/tags/gitrebase" class="mention hashtag" rel="nofollow noopener" target="_blank">#gitrebase</a>

https://purl.org/rzr#<a href="https://www.slideshare.net/slideshow/embed_code/key/CfDm6GMpv73he1#tizen-upstream-coop-tdc2014-pcoval#" rel="nofollow noopener" target="_blank">https://www.slideshare.net/slideshow/embed_code/key/CfDm6GMpv73he1#tizen-upstream-coop-tdc2014-pcoval#</a> <a href="https://mastodon.social/tags/OpenSource" class="mention hashtag" rel="nofollow noopener" target="_blank">#OpenSource</a> flows I explained for <a href="https://mastodon.social/tags/Tizen" class="mention hashtag" rel="nofollow noopener" target="_blank">#Tizen</a> in 2014 to improve upstream/downstream cooperation are still valid today, anyone need to learn <a href="https://mastodon.social/tags/GitRebase" class="mention hashtag" rel="nofollow noopener" target="_blank">#GitRebase</a> soon or later, more <a href="https://purl.org/rzr/presentations" rel="nofollow noopener" target="_blank">https://purl.org/rzr/presentations</a>

Recent searches

Search options

Administered by:

Server stats:

#GitRebase