Replying to Avatar musicmatze :rust: :nixos:

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
Avatar
Awiteb 10mo ago 💬 2

I use `git merge something || git status -s && git merge --abort` and if there is a conflicts I mention the conflicts to the patch author and ask for another version of the patch. If there is no conflicts the patch will be merged

Reply to this note

Please Login to reply.

Discussion

Avatar
musicmatze :rust: :nixos: 10mo ago

nostr:npub1qqqqqq2stely3ynsgm5mh2nj3v0nk5gjyl3zqrzh34hxhvx806usxmln03

The whole point is that there is no merge.

Avatar
Awiteb 10mo ago

For me, I want to merge it, but if there is a conflicts I don't want to fix it, lol