# Merge pull request \#269 from SunkenInTime/t3/field-merge-server · dara/icarus

[View on GitCafe](https://git.cafe/dara/icarus/commit/4d1d9e954b6ffd9f07a7eaebf80b9920d9160f4c)

Repository: [dara/icarus](https://git.cafe/dara/icarus)

Visibility: public

Requested revision: 4d1d9e954b6ffd9f07a7eaebf80b9920d9160f4c

Requested commit: 4d1d9e954b6ffd9f07a7eaebf80b9920d9160f4c

Commit: 4d1d9e954b6ffd9f07a7eaebf80b9920d9160f4c

Tree: 0379d252a37088106c695d951337382d27df68de

Author: Dara Adedeji

Committer: GitHub

## Message

```
Merge pull request #269 from SunkenInTime/t3/field-merge-server

Merge cloud edits by field on the server
```

## Parents

- [656ac5e12d1a6d3f7fbbc69198235bf4fae29821](https://git.cafe/dara/icarus/commit/656ac5e12d1a6d3f7fbbc69198235bf4fae29821?format=markdown)

- [97622ceaeebb0956407e2d318d4eda86e86b397e](https://git.cafe/dara/icarus/commit/97622ceaeebb0956407e2d318d4eda86e86b397e?format=markdown)

[Source at this commit](https://git.cafe/dara/icarus/tree/4d1d9e954b6ffd9f07a7eaebf80b9920d9160f4c?format=markdown)