Helvede

0 posts0 participants0 posts today

data0🔀🦒 <a href="https://indieweb.social/tags/Mergiraf" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#Mergiraf</a> v0.5.0 is out! Mergiraf is a syntax-aware <a href="https://indieweb.social/tags/git" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#git</a> <a href="https://indieweb.social/tags/merge" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#merge</a> driver that solves many conflicts automatically that git's built-in merge strategies can't. <a href="https://codeberg.org/mergiraf/mergiraf/releases/tag/v0.5.0" rel="nofollow noopener noreferrer" translate="no" target="_blank">https://codeberg.org/mergiraf/mergiraf/releases/tag/v0.5.0</a><a href="https://indieweb.social/tags/opensource" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#opensource</a> <a href="https://indieweb.social/tags/coding" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#coding</a> <a href="https://indieweb.social/tags/programming" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#programming</a> <a href="https://indieweb.social/tags/cvs" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#cvs</a>

Aral Balkangit mindfuck of the day:• While merging branch B into branch A, A is “ours”, B is “theirs” (changes from B are reflected in A)• When rebasing branch B on top of branch A, A is ”ours”, B is “theirs” (changes from A are reflected in B)<a href="https://nitaym.github.io/ourstheirs/" rel="nofollow noopener noreferrer" translate="no" target="_blank">https://nitaym.github.io/ourstheirs/</a><a href="https://mastodon.ar.al/tags/git" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#git</a> <a href="https://mastodon.ar.al/tags/merge" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#merge</a> <a href="https://mastodon.ar.al/tags/rebase" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#rebase</a> <a href="https://mastodon.ar.al/tags/ours" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#ours</a> <a href="https://mastodon.ar.al/tags/theirs" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#theirs</a> <a href="https://mastodon.ar.al/tags/dev" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#dev</a>

Want Ch🔁nge? W🔁rk T🔁gether☑<a href="https://qoto.org/@bibliolater" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@bibliolater</a> Accounts with manual control or 🔒 means you can to do "1 at a time" approach and helps focus on 1 person that way, and see any opportunities or question in passing more realtime (follows can add up fast without control and be lost to anything similar at the time of following).Greeting and meeting of people has been quite fruitful considering most people are duds in the race to relativity and changing their life or climate.So in summary- makes me check their profile - send a message if I see relativity - decide on accepting based on above. - No reply, no follow.I like the list below by AmazingMeagen <a href="https://historians.social/@AmazingMeagen" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@AmazingMeagen</a> but my list show smore proactive use more than mostly defensive (so both lists are good)- a closed loop of communication - attempt at preventing AI intellectual theft - personal safetyI consider that <a href="https://qoto.org/tags/relativity" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#relativity</a> can be <a href="https://qoto.org/tags/lost" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#lost</a> by losing track of followers... but maybe it's mostly for what I do and looking for (real <a href="https://qoto.org/tags/contact" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#contact</a> / 1-out-of-a-million / a real <a href="https://qoto.org/tags/person" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#person</a> working on others and not just self or job... to check out and <a href="https://qoto.org/tags/merge" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#merge</a> each other's work, even just to listen as what the world needs more of...)So for example: You can do that AND <a href="https://qoto.org/tags/respond" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#respond</a> - so that's good! Sadly many cannot on <a href="https://qoto.org/tags/social" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#social</a>...!

jnpnif you ever wonder how to specify git merge strategy in magit, the flag is there but hidden (...)press C-x a to list all merge flagsyou'll see the -X strategy-option= now<a href="https://mastodon.social/tags/emacs" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#emacs</a> <a href="https://mastodon.social/tags/magit" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#magit</a> <a href="https://mastodon.social/tags/git" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#git</a> <a href="https://mastodon.social/tags/merge" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#merge</a>

robrichWhen you are gonna <a href="https://hachyderm.io/tags/merge" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#merge</a> two <a href="https://hachyderm.io/tags/git" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#git</a> branches after a long time

Jonathan MatthewsSo I definitely *recall* there being a <a href="https://fosstodon.org/tags/git" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#git</a> mechanism available when initiating a <a href="https://fosstodon.org/tags/rebase" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#rebase</a> which you expect to contain conflicts, where *specific*files* could have a <a href="https://fosstodon.org/tags/merge" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#merge</a> <a href="https://fosstodon.org/tags/strategy" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#strategy</a> selected ahead of time, but without the whole-<a href="https://fosstodon.org/tags/worktree" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#worktree</a> impact of "-s theirs/ours" ... but I can't find it! Any ideas?

JenkellyAll-timers. <a href="https://mstdn.social/tags/teenagefanclub" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#teenagefanclub</a> <a href="https://mstdn.social/tags/merge" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#merge</a> <a href="https://mstdn.social/tags/powerpop" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#powerpop</a> <a href="https://mstdn.social/tags/music" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#music</a> <a href="https://aquariumdrunkard.com/2023/09/26/catching-up-with-teenage-fanclub/" rel="nofollow noopener noreferrer" translate="no" target="_blank">https://aquariumdrunkard.com/2023/09/26/catching-up-with-teenage-fanclub/</a>

Recent searches

Search options

Administered by:

Server stats:

#merge