Score:0

git: checking merge conflicts WITHOUT actually doing the merge

bd flag

Can't find the answer to this precise question via googling.

I do normal merge, say git merge origin/master. Say some conflicts are created.

I do not want that. I would like to just check, see the possible conflicts, in terms of files, commits, and diffs without starting the merge process.

Sure, I can do git reset --hard. Rather drastic for just seeing potential conflicts.

in flag
Does this answer your question? https://stackoverflow.com/questions/501407/is-there-a-git-merge-dry-run-option
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.