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
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
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
