sommerfeld on Nostr: Always start a new feature branch by always branching off origin/master using `git ...
Always start a new feature branch by always branching off origin/master using `git switch -c feature/branch origin/master` (previous git fetch required obviously).
Then after pushing it remotely, reviewal and approval, you can merge it directly to origin/master or, if your repo policy is avoiding merges, you can push the feature branch directly to origin/master using `git push feature/branch: master`
You don't ever really need to have a 'local master'
Published at
2024-08-19 08:32:34Event JSON
{
"id": "6ff0d18ffc3eba9c35bed4da4cde906f07f27a8885b5d22d1834d62829360250",
"pubkey": "d0debf9fb12def81f43d7c69429bb784812ac1e4d2d53a202db6aac7ea4b466c",
"created_at": 1724056354,
"kind": 1,
"tags": [
[
"e",
"a3ae24daf65349c4f1dfd29809269f62c5f083fc905b5c11d125bc748722a948",
"",
"root"
],
[
"e",
"1a5a1490f33240f4ebf072000e7f17a73822f164a33a03a3ec4d1fc3a36d9572",
"",
"reply"
],
[
"p",
"d0debf9fb12def81f43d7c69429bb784812ac1e4d2d53a202db6aac7ea4b466c"
],
[
"p",
"8561811f7c61a9351c10c3d65e13dff5e75b2da86418e726280dbf08fe0f3736"
]
],
"content": "Always start a new feature branch by always branching off origin/master using `git switch -c feature/branch origin/master` (previous git fetch required obviously).\n\nThen after pushing it remotely, reviewal and approval, you can merge it directly to origin/master or, if your repo policy is avoiding merges, you can push the feature branch directly to origin/master using `git push feature/branch: master`\n\nYou don't ever really need to have a 'local master'",
"sig": "3cdce7c6edf04fca5d8c8a882b60ea5f69fcfe4f2013e0207fc461e28a8fd5ae6364c10a119beb59971cb4a73137bcd0badda3e6243540f928afcc5400043557"
}
