adding statement to data approval

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

adding statement to data approval #58

Closed shreyaponnamma closed 3 months ago

shreyaponnamma commented 5 months ago

@simon-wacker Could you please explain why this branch has conflicts? And can you please explain me why the branch add-statement is 8 commits behind develop even though Christoph and I rebased and pushed the latest code?

simon-wacker commented 3 months ago

Dear Shreya, I applied some extensive code style changes with JetBrain's cleanupcode command. This resulted in dramatic code changes. I thus rebased your branch onto the new develop and gave it the name add-statement-rebased. The corresponding pull request is https://github.com/building-envelope-data/database/pull/59 Please work on the new branch from now on. Thanks! I'll try to reach you next week in the office so we can talk about whatever questions arose during my leave.