Mastodon

WolfMerge conflicts in <a href="https://hachyderm.io/tags/git" class="mention hashtag" rel="nofollow noopener" target="_blank">#git</a> are still the hardest work I have to do related to working on a team (I’m not counting code-review). The things I do to branches are probably more complicated than I need them to be. But I’ve found something else in git that takes effort: managing the <a href="https://hachyderm.io/tags/gitstash" class="mention hashtag" rel="nofollow noopener" target="_blank">#gitstash</a>. At this moment I have six entries in my stash. Deciding which ones to keep and which ones to drop and all the commands to manipulate and all the things you can’t do (like renaming entries). Annoying.

:rss: Qiita - 人気の記事【git stash入門｜初心者向け】3分で学べる！git stashの基本的な使い方 <a href="https://qiita.com/wamauuphhh/items/687530c5638605cd0779?utm_campaign=popular_items&utm_medium=feed&utm_source=popular_items" rel="nofollow noopener" translate="no" target="_blank">https://qiita.com/wamauuphhh/items/687530c5638605cd0779?utm_campaign=popular_items&utm_medium=feed&utm_source=popular_items</a><a href="https://rss-mstdn.studiofreesia.com/tags/qiita" class="mention hashtag" rel="nofollow noopener" target="_blank">#qiita</a> <a href="https://rss-mstdn.studiofreesia.com/tags/Git" class="mention hashtag" rel="nofollow noopener" target="_blank">#Git</a> <a href="https://rss-mstdn.studiofreesia.com/tags/GitHub" class="mention hashtag" rel="nofollow noopener" target="_blank">#GitHub</a> <a href="https://rss-mstdn.studiofreesia.com/tags/%E5%88%9D%E5%BF%83%E8%80%85" class="mention hashtag" rel="nofollow noopener" target="_blank">#初心者</a> <a href="https://rss-mstdn.studiofreesia.com/tags/%E5%88%9D%E5%BF%83%E8%80%85%E5%90%91%E3%81%91" class="mention hashtag" rel="nofollow noopener" target="_blank">#初心者向け</a> <a href="https://rss-mstdn.studiofreesia.com/tags/gitstash" class="mention hashtag" rel="nofollow noopener" target="_blank">#gitstash</a>

aegilops :github::microsoft:<a href="https://mastodon.social/@joxean" class="u-url mention" rel="nofollow noopener" target="_blank">@joxean</a> in git I’d just use a branch for this, and use commits.You can checkout different branches quickly to switch between different sets of commits you make (e.g. feature branches).This SO top answer agrees: <a href="https://stackoverflow.com/questions/3656351/git-for-perforce-users" rel="nofollow noopener" target="_blank">https://stackoverflow.com/questions/3656351/git-for-perforce-users</a>You can use git stash too: <a href="https://git-scm.com/docs/git-stash" rel="nofollow noopener" target="_blank">https://git-scm.com/docs/git-stash</a>It has a “stack” but you can apply a stash out of order.I only use stash as a last resort when I get in a tangle, not as a way to store anything; no tips on workflow.<a href="https://fosstodon.org/tags/git" class="mention hashtag" rel="nofollow noopener" target="_blank">#git</a> <a href="https://fosstodon.org/tags/perforce" class="mention hashtag" rel="nofollow noopener" target="_blank">#perforce</a> <a href="https://fosstodon.org/tags/GitStash" class="mention hashtag" rel="nofollow noopener" target="_blank">#GitStash</a>

Recent searches

Search options

Administered by:

Server stats:

#gitstash