Ok thanks,

let me know if you found out why and if the "merge" on a file i did not touch 
was correct.

Florian

Am Donnerstag, dem 24.11.2022 um 22:18 +0000 schrieb Dominik Riemer:
> Hi Florian,<br>
> thanks for finding this! We need to investigate as the last commit message 
> deletes a test file which should not have been deleted. <br>
> 
> I can have a deeper look at the PR during the weekend, or maybe somebody else 
> has an idea what went wrong?<br>
> 
> Cheers<br>
> Dominik<br>
> 
> On 2022/11/24 09:48:41 Florian Micklich wrote:<br>
> > Hi Dominik,<br>
> > 
> > I have a short git result question on you.<br>
> > 
> > I am working in my branch STREAMPIPES-642 and before I pushed my commits, I 
> > did a rebase on dev.<br>
> > During this process an odd result came up.<br>
> > I had to merge a file that I did not touch at all.<br>
> > 
> > As you wrote the code, can you check if I didn't mess up anything?<br>
> > Still don't know why this message occurs because it has nothing to do with 
> > my code changes at all.<br>
> > 
> > Sorry for the inconvenience.<br>
> > 
> > 
> > [https://github.com/apache/streampipes/commits/STREAMPIPES-642/streampipes-data-explorer/src/test/java/org/apache/streampipesdataexplorer/v4/query/writer](https://github.com/apache/streampipes/commits/STREAMPIPES-642/streampipes-data-explorer/src/test/java/org/apache/streampipesdataexplorer/v4/query/writer)<br>
> > 
> > Florian<br>
> > 

Reply via email to