search

xapi-project / xapi-storage

Experimental new storage interface for xapi
https://xapi-project.github.io/xapi-storage/
9 stars 19 forks source link

Fix merge conflicts between master and feature/REQ477/master #88

Closed edwintorok closed 6 years ago

edwintorok commented 6 years ago

To avoid doing a force push create a merge commit with git merge -s recursive -X ours origin/master. This should allow us to review the changes that happened on master and were not on the SMAPIv3 branch, and double check they didn't get lost.

The only difference vs feature/REQ477/master is the history:

git diff feature/REQ477/master|wc
      0       0       0