IMPORTANT! CORRUPTED BRANCHES #60
FdezAriasSara
announced in
Announcements
Replies: 0 comments
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
-
Due to merging without solving conflicts, and commiting after that merge, two branches are full of errors derived of a mix of old code and new code.
THE CORRUPTED BRANCHES THAT SHOULD NOT BE USED ARE mapnew and map-connection
In order to not loose the parts that where working:
I created a new branch (called map-connectionFinal) from the specific commit BEFORE dissaster:
last non corrupted commit at mapnew
then , i merged that functionality with the backend logic that is working up to now
then , the functionality of selecting different pod providers @Batuhanbyr added, could not be merged because of the problem mentioned before.
In order not to loose his job , I copy pasted his loginView.js version , so it could appear. But that work is completely batus.
Beta Was this translation helpful? Give feedback.
All reactions