I noticed when I run «git pull» And having ,---- | [pull] | rebase = true `---- I obtain ,---- | Auto-merging test.org | CONFLICT (content): Merge conflict in test.org | error: could not apply 72a4c4e... Laura, Conflict RH is TRUE | hint: Resolve all conflicts manually, mark them as resolved with | hint: "git add/rm <conflicted_files>", then run "git rebase --continue". | hint: You can instead skip this commit: run "git rebase --skip". | hint: To abort and get back to the state before "git rebase", run "git rebase --abort". `---- However when I have ,---- | [pull] | rebase = false `---- 1. Git pull 2. Or git fetch and git merge Only result in ,---- | Auto-merging test.org | CONFLICT (content): Merge conflict in test.org | Automatic merge failed; fix conflicts and then commit the result. `---- But I am looking for a configuration in which the message also states ,---- | hint: To abort and get back to the state before "git merge", | run "git merge --abort". `---- Rationale. This is for my students of next year: in case they pull/(fetch-merge) It might be too much for them to try to solve a merging/editing conflict. So the idea is: they should 1. Abort 2. Inform me I then would 1. revert my last commit, 2. push again, 3. so they can then pull 4. Push their commit (which is in conflict to mine) 5. But then I pull and then resolve the conflict. I googled but without much success. Thanks Uwe Brauer -- Warning: Content may be disturbing to some audiences I strongly condemn Putin's war of aggression against the Ukraine. I support to deliver weapons to Ukraine's military. I support the NATO membership of the Ukraine. I support the EU membership of the Ukraine. https://addons.thunderbird.net/en-US/thunderbird/addon/gmail-conversation-view/ -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/git-users/87fs5nuk16.fsf%40mat.ucm.es.
Description: S/MIME cryptographic signature