search

building-envelope-data / database

Reference implementation of a product data server as part of the product data network buildingenvelopedata.org
MIT License
0 stars 0 forks source link

Add statement to data approval #59

Closed simon-wacker closed 2 weeks ago

simon-wacker commented 3 months ago

Rebased #58

simon-wacker commented 2 months ago

@shreyaponnamma04 I had introduced other errors that I fixed in the branch develop. You need to rebase this branch and do a force commit. We can also do this together next week as it is a bit complicated. If you want to do it alone, then first commit all your changes with git add . and git commit -m .... Then run git checkout develop && git pull -p && git checkout add-statement-rebased && git rebase develop. Fix any upcoming conflicts and afterwards run git rebase --continue. In the end, when you are sure that you have a properly running version, run git push --force.

simon-wacker commented 2 weeks ago

@shreyaponnamma04 I made some final fixes in my last 3 commits (please have a look) and I merged the branch (finally). You can checkout develop and drop your local version of this branch by running git checkout develop && git pull -p && git branch -D add-statement-rebased.