search

dendeaisd / Webserv

3 stars 0 forks source link

Do NOT merge it, but check them out tho #74

Closed dendeaisd closed 3 weeks ago

dendeaisd commented 4 weeks ago

We need to double triple check that this merge would not fuck the commit history, my branch had still the old commit history from before my fuck up, so i had to replace all of the commits on my local branch and force push to github, to make the histories compatible

letsgogeeky commented 4 weeks ago

Wow that's great!! and super fancy xDD!!

About the history. yes, unfortunately, this cannot be merged. it would be best if you started a new branch from main and copy the work done here to the new branch. this one will bamboozle the repository xD!

dendeaisd commented 4 weeks ago

Not even if we merge and rebase? @letsgogeeky

letsgogeeky commented 4 weeks ago

Not even if we merge and rebase? @letsgogeeky

We can try to first rebase your branch on main (locally) and then if the files marked as deleted is not in the changes anymore we can merge it.

dendeaisd commented 3 weeks ago

okyy