Julia Evans on Nostr: ok the people have voted that git bonus comic #6 should be about tips for resolving ...
ok the people have voted that git bonus comic #6 should be about tips for resolving merge conflicts. would love to hear if you have any tips/gotchas to share about resolving merge conflicts!
Published at
2024-06-14 18:10:00Event JSON
{
"id": "aa4edf1d1e44763fc2553d173e100d34b12f45c7e3cf181e49af361562fda426",
"pubkey": "26cad6f140bf86de9c26b7c15419cab1aebdd7086358d26aa2d750e21cf3bf2e",
"created_at": 1718388600,
"kind": 1,
"tags": [
[
"proxy",
"https://social.jvns.ca/users/b0rk/statuses/112616315307521919",
"activitypub"
]
],
"content": "ok the people have voted that git bonus comic #6 should be about tips for resolving merge conflicts. would love to hear if you have any tips/gotchas to share about resolving merge conflicts!",
"sig": "be0195c3c0fa7685fec57a79d756fb9afe8b8c6d022ce85e4c63dfe13cf5e3fb674b94da1ba562b1e6571edf41132b808771ec002429ead31ff88de39d6b041a"
}
