musicmatze :rust: :nixos: on Nostr: One of my favorite little helper tools: ``` git will-there-be-conflicts master HEAD ...
One of my favorite little helper tools:
```
git will-there-be-conflicts master HEAD
```
To try to merge, but not commit anything, not stage anything. #git
Published at
2025-02-05 16:38:54Event JSON
{
"id": "cb588fb0f5633c438a71826403a29014f2b9d65056423611c4dcbb2f14cfb7f7",
"pubkey": "9774fa73d93e8079d02b61097a0aae23f9890f35ef99040aec95d0def2f24e27",
"created_at": 1738773534,
"kind": 1,
"tags": [
[
"t",
"git"
],
[
"proxy",
"https://social.linux.pizza/users/musicmatze/statuses/113952262367970237",
"activitypub"
]
],
"content": "One of my favorite little helper tools:\n\n```\ngit will-there-be-conflicts master HEAD\n```\n\nTo try to merge, but not commit anything, not stage anything. #git",
"sig": "f01a14ff4ea99df607efec4cfa056813a65c5e45e7661dc4bcb0cb2e94ea1714b2d490737888e732a15a74dad764d2c03d7c5f0d9c6e55bf6df5860197d8a66d"
}
