npub1upkp7fd7rc3lrjg23r8gy0wc723vze7mxlx5984ut6zurjzpf5xss4tcwy (npub1upk…tcwy) npub1uzgxh53ntnrjf3q4w3zjq7xgx50h64m5p85pvz9gqj928k0quluqxcychd (npub1uzg…ychd) `git rebase branch` on main does result in a weird state. Would not recommend.
`git rebase main` **on branch** updates your branch commits to be as they would have been had you started from where main is now, and that will let you find the places where your work is in conflict with the rest of the team's work.
It's also stuff that has to be dealt with eventually so might as well do it locally.
Graydon /
npub1gg…9w0xq
2023-11-21 17:01:21
in reply to nevent1q…9lzg
Author Public Key
npub1gg0lmq7zl3n3cp3ay7jv7eat9lfqk3ljfx2wf3rnwzk8n462evsqc9w0xqPublished at
2023-11-21 17:01:21Event JSON
{
"id": "d3d1858dfceb938e489f9be4525033ff625e10832fe35737edcdf1f2fac7c987",
"pubkey": "421ffd83c2fc671c063d27a4cf67ab2fd20b47f24994e4c47370ac79d74acb20",
"created_at": 1700586081,
"kind": 1,
"tags": [
[
"p",
"e06c1f25be1e23f1c90a88ce823dd8f2a2c167db37cd429ebc5e85c1c8414d0d",
"wss://relay.mostr.pub"
],
[
"p",
"e0906bd2335cc724c41574452078c8351f7d577409e81608a8048aa3d9e0e7f8",
"wss://relay.mostr.pub"
],
[
"p",
"26cad6f140bf86de9c26b7c15419cab1aebdd7086358d26aa2d750e21cf3bf2e",
"wss://relay.mostr.pub"
],
[
"p",
"ba306e606ef310fbf9e5a15fb741099310fe2c2c9d4f3b9fdcade01d1e4028f0",
"wss://relay.mostr.pub"
],
[
"e",
"38dc187b7d95f74cb74e624fcf768b7d8e790015a44fd2eb144e1f250994aa30",
"wss://relay.mostr.pub",
"reply"
],
[
"proxy",
"https://canada.masto.host/users/graydon/statuses/111449609462641887",
"activitypub"
]
],
"content": "nostr:npub1upkp7fd7rc3lrjg23r8gy0wc723vze7mxlx5984ut6zurjzpf5xss4tcwy nostr:npub1uzgxh53ntnrjf3q4w3zjq7xgx50h64m5p85pvz9gqj928k0quluqxcychd `git rebase branch` on main does result in a weird state. Would not recommend.\n\n`git rebase main` **on branch** updates your branch commits to be as they would have been had you started from where main is now, and that will let you find the places where your work is in conflict with the rest of the team's work.\n\nIt's also stuff that has to be dealt with eventually so might as well do it locally.",
"sig": "9ef5375d37f73ff4437cef4fca50a7362b1fe825e2a52684e5a110e74c3265d27d460fd1acbc36a22d07d8a20cad57baf6381c730c20325aa26bdddab5738945"
}