search

ossia / qml-remote

1 stars 1 forks source link

Feature/position #35 #37

Closed Toine-ddt closed 3 years ago

jcelerier commented 3 years ago

What I'd recommend:

  1. Read https://git-scm.com/book/fr/v2/Utilitaires-Git-R%C3%A9%C3%A9crire-l%E2%80%99historique
  2. git checkout feature/position
  3. git rebase -i 4e22cf8
  4. Squash all the commits
  5. Remove the conflicting change in src/WebSocket/ScoreWebSocket.qml (maybe something like git checkout main src/WebSocket/ScoreWebSocket.qml is enough)
  6. git commit --amend
  7. git push --force
Toine-ddt commented 3 years ago

I am working on it

Toine-ddt commented 3 years ago

I have done what you had recommended @jcelerier but there are still conflicts. so what commands can I use to resolve them efficiently ?

jcelerier commented 3 years ago

weird, it looks like the feature/position was already pushed to main no ?

Toine-ddt commented 3 years ago

ah yes ! but I don't know how and when ?

jcelerier commented 3 years ago

a mystery for another day :) let's close that pr since it's already merged

Toine-ddt commented 3 years ago

I had made new modifications, I am going to make a new PR