Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

All my latest improvments, such as the Import/Export folder selection, the export of the current and opened scores, ... #17

Merged
merged 24 commits into from
Dec 7, 2022

Conversation

lgvr123
Copy link
Contributor

@lgvr123 lgvr123 commented Dec 1, 2022

No description provided.

@Jojo-Schmitz
Copy link
Owner

A rebase is needed

@lgvr123
Copy link
Contributor Author

lgvr123 commented Dec 5, 2022

My history seems clean:
history
(source/master being your version).
There is nothing to rebase (as far as I understand Git). What more are you expecting ?

@Jojo-Schmitz
Copy link
Owner

Jojo-Schmitz commented Dec 5, 2022

"This branch cannot be rebased due to conflicts"

And that merge commit doesn't belong there either

@lgvr123
Copy link
Contributor Author

lgvr123 commented Dec 5, 2022

This seems a common problem.
One of the approach would be that you squash all the individual commits:
JmBy8

@Jojo-Schmitz
Copy link
Owner

Jojo-Schmitz commented Dec 5, 2022

Maybe I could, but sorry, that's your job, not mine ;-)

git pull --rebase upstream master fix the conflicts, git rebase --continue; git push -f

@lgvr123
Copy link
Contributor Author

lgvr123 commented Dec 5, 2022

I'm learning every day !! Next time, I'll do a rebase instead of a merge.
I guess it should be correct now.

@Jojo-Schmitz
Copy link
Owner

Jojo-Schmitz commented Dec 6, 2022

Sorry, I'm afraid you'd have to do it again

Merge remote-tracking branch 'source/master' into MergeSource

# Conflicts:
#	Readme.md
#	batch_convert.qml
@lgvr123
Copy link
Contributor Author

lgvr123 commented Dec 7, 2022

Done

@Jojo-Schmitz Jojo-Schmitz merged commit 97bb12b into Jojo-Schmitz:master Dec 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants