# git: Save buffer when resolving a conflict from the project diff \(\#30762\) · gitcafe/zed

[View on GitCafe](https://git.cafe/gitcafe/zed/commit/9041f734fde17ab2356698ca3bc5d412e23d243c)

Repository: [gitcafe/zed](https://git.cafe/gitcafe/zed)

Visibility: public

Requested revision: 9041f734fde17ab2356698ca3bc5d412e23d243c

Requested commit: 9041f734fde17ab2356698ca3bc5d412e23d243c

Commit: 9041f734fde17ab2356698ca3bc5d412e23d243c

Tree: 5d4cb84816c23a5c1e1396b0624cdc070b0fce4c

Author: Cole Miller

Committer: GitHub

## Message

```
git: Save buffer when resolving a conflict from the project diff (#30762)

Closes #30555

Release Notes:

- Changed the project diff to autosave the targeted buffer after
resolving a merge conflict.
```

## Parents

- [844c7ad22e211a2ea6515e1a2a45619f98c55972](https://git.cafe/gitcafe/zed/commit/844c7ad22e211a2ea6515e1a2a45619f98c55972?format=markdown)

[Source at this commit](https://git.cafe/gitcafe/zed/tree/9041f734fde17ab2356698ca3bc5d412e23d243c?format=markdown)