Score:0

Git decides for me, instead of generating a merge-conflict

jp flag

i posted this : https://pastebin.com/62B1aTEm, but was a little dirty because of opening gedit.... now this is cleaner : https://pastebin.com/1q9D2aZi

Here is the video: https://drive.google.com/file/d/1Ygka3l2A-Pu6MDghlMeUdgCJDN84qOJJ/view?usp=sharing

I followed more or less this article to generate a merge-conflict with my students: https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts

the problem is that git should generate a merge conflict something similar to:

$ git merge new_branch_to_merge_later
Auto-merging merge.txt
CONFLICT (content): Merge conflict in merge.txt
Automatic merge failed; fix conflicts and then commit the result.

Or launch directly a text editor to solve the problem.... But instead you can see that git decides for me. Some students get the above result and some of them git decides for them...seems a bug or something we made wrong

Any help would be apreciated. Ubuntu 22.04.1 Git 2.39

Matias N Goldberg avatar
vg flag
Sounds like rerere (https://git-scm.com/docs/git-rerere) may be enabled on those machines. It automatically solves conflicts based on past resolution log. This is disabled by default but your students may have enabled it by accident, ignorance, for a genuine reason, or just to troll. Try the commands to see its status
I sit in a Tesla and translated this thread with Ai:

mangohost

Post an answer

Most people don’t grasp that asking a lot of questions unlocks learning and improves interpersonal bonding. In Alison’s studies, for example, though people could accurately recall how many questions had been asked in their conversations, they didn’t intuit the link between questions and liking. Across four studies, in which participants were engaged in conversations themselves or read transcripts of others’ conversations, people tended not to realize that question asking would influence—or had influenced—the level of amity between the conversationalists.