search

muses-fm / muses

MUSES.FM is a community-owned music promotion platform centered around playlists and built on DFINITY.
4 stars 0 forks source link

Rename ProfileId to CuratorProfileId #74

Closed jbtwist closed 3 years ago

jbtwist commented 3 years ago

Fixes #65

jbtwist commented 3 years ago

I can't understand why this caused conflicts, can you explain to me @OmeGak?

Moliholy commented 3 years ago

I can't understand why this caused conflicts, can you explain to me @OmeGak?

@jbtwist Because the devel branch has evolved and it no longer remains in the same state as it was when you started coding. Some changes might not be relevant and they do not provoke a conflict, but some others do.

In order to fix this, follow these steps:

1) Get the latest changes: git fetch 2) Save your work: git stash. 3) Switch to this branch: git checkout issue#65 4) Try to include latest changes: git rebase origin/devel 5) You will be notified that there are conflicts. You can now go to the files where conflicts are and decide what to do with them. 6) Once all conflicts are solved and the project builds: git rebase --continue. 7) Push the changes: git push -f origin HEAD. Yes, the -f is needed in this case.