search

adaptive-cfd / WABBIT

Wavelet Adaptive Block-Based solver for Interactions with Turbulence
https://www.cfd.tu-berlin.de/
GNU General Public License v3.0
56 stars 27 forks source link

New ghost nodes #38

Closed Philipp137 closed 4 years ago

tommy-engels commented 4 years ago

philipp, what is going on here ? the changes to newGhostNodes have been selectively commited to master branch in my last commit. there is no need to merge newGhostNodes anymore? maybe I miss something?

Philipp137 commented 4 years ago

hello tommy, sorry but i forgot to push some code before you did the merge. It seems that github doesnt allow to do regular commits to new_ghost branch anymore. I would like to review the pull request my own, but it seems to be not possible. Anyhow, you can leave it as it is. I will do the changes manually in the master.

tommy-engels commented 4 years ago

yes. the problem is that commit "manually merge newGhostNodes with its many changes in the main ..." is a merge but not in the GIT sense, because the ghost nodes were not actually merged ("cherry-picking"), therefore we cannot automatically merge...life can be quite hard :)