Embed Notice

HTML Code

<blockquote style="position: relative; padding-left: 55px;"><section><a href="https://social.jvns.ca/users/b0rk/statuses/111567964185323065">Julia Evans (b0rk@social.jvns.ca)'s status on Sunday, 07-Jan-2024 19:50:02 JST</a><a href="https://social.jvns.ca/@b0rk" title="b0rk@social.jvns.ca"><img src="https://gnusocial.jp/avatar/88850-48-20230116234922.webp" width="48" height="48" alt="Julia Evans" style="position: absolute; left: 0; top: 0;">Julia Evans</a></section><article><p>git branches have no rules</p><p>permalink: <a href="https://wizardzines.com/comics/branches-have-no-rules/" rel="nofollow noreferrer">https://wizardzines.com/comics/branches-have-no-rules/</a></p></article><footer><a rel="bookmark" href="https://gnusocial.jp/conversation/2553867#notice-5055849">In conversation</a><time datetime="2024-01-07T19:50:02+09:00" title="Sunday, 07-Jan-2024 19:50:02 JST">Sunday, 07-Jan-2024 19:50:02 JST</time> <span>from <span><a href="https://social.jvns.ca/@b0rk/111567964185323065" rel="external" title="Sent from social.jvns.ca via ActivityPub">social.jvns.ca</a></span></span><a href="https://social.jvns.ca/@b0rk/111567964185323065">permalink</a><h4>Attachments</h4><ol><li><label><a rel="external" href="https://gnusocial.jp/attachment/2076620">panel 1: you might expect git to enforce some rules about branchessome rules you might imagine:* you can't remove commits from a branch, only add them
* the `main` branch has to stay more less in sync with `origin/main`But there are no rules.git character with demon hat: "want to do something horrible to your branch? no problem! "panel 2: there are literally no rulescommands that you can use to do weird stuff to a branch:* git reset
* git rebasepanel 3: instead of rules, we have conventionsfor example:* run `git pull` often to keep your `main` up to date
* if you're working with a big team, don't commit to `main` directlygit demon: "you've just gotta be really careful to not do the wrong thing and not mess up your branch"person with curly hair: "um... thanks?"panel 4: our only saviour: the refloggit reflog BRANCHNAMEwill show you the history of every change to the branch, so you can always undothe reflog is a VERY unfriendly UI, but it's always there.</a></label><br><a href="https://cdn.masto.host/socialjvnsca/media_attachments/files/111/567/963/889/958/233/original/6c8f6bf71c17ab3b.png" rel="external">https://cdn.masto.host/socialjvnsca/media_attachments/files/111/567/963/889/958/233/original/6c8f6bf71c17ab3b.png</a></li><li><article><header><div>Domain not in remote thumbnail source whitelist: wizardzines.com</div><h5><a href="https://wizardzines.com/comics/branches-have-no-rules/">branches have no rules</a></h5><div></div></header><div></div><footer></footer></article></li></ol></footer></blockquote>

Corresponding Notice

Embed this notice
Julia Evans (b0rk@social.jvns.ca)'s status on Sunday, 07-Jan-2024 19:50:02 JST Julia Evans
git branches have no rules
permalink: https://wizardzines.com/comics/branches-have-no-rules/
In conversationSunday, 07-Jan-2024 19:50:02 JST from social.jvns.capermalink
Attachments
1. panel 1: you might expect git to enforce some rules about branches some rules you might imagine: * you can't remove commits from a branch, only add them * the `main` branch has to stay more less in sync with `origin/main` But there are no rules. git character with demon hat: "want to do something horrible to your branch? no problem! " panel 2: there are literally no rules commands that you can use to do weird stuff to a branch: * git reset * git rebase panel 3: instead of rules, we have conventions for example: * run `git pull` often to keep your `main` up to date * if you're working with a big team, don't commit to `main` directly git demon: "you've just gotta be really careful to not do the wrong thing and not mess up your branch" person with curly hair: "um... thanks?" panel 4: our only saviour: the reflog git reflog BRANCHNAME will show you the history of every change to the branch, so you can always undo the reflog is a VERY unfriendly UI, but it's always there.
  https://cdn.masto.host/socialjvnsca/media_attachments/files/111/567/963/889/958/233/original/6c8f6bf71c17ab3b.png
2. Domain not in remote thumbnail source whitelist: wizardzines.com
  branches have no rules

Public

Embed Notice

HTML Code

Corresponding Notice