Can git tell me if a merge will conflict without actually merging?
90720
Is there a git-merge --dry-run option?
12943
How to discard local commits in Git?
147273
How can I see what I am about to push with git?
119711
Git workflow and rebase vs merge questions
63011
Git merge left HEAD marks in my files
7088
How to make git ignore changes in case?
36692
Which version of the git file will be finally used: LOCAL, BASE or REMOTE?
9079
Mark-as-duplicate vs. Merge
115773
"selectively" merging with git
106905
Merge, update, and pull Git branches without using checkouts
94501
How do I reduce the size of a bloated Git repo by non-interactively squashing all commits except for the most recent ones?
74671
How to make Git ignore changes I'm making to a file (under source control)?
42987
How do I merge my local uncommitted changes into another Git branch?
122624
How to get a list of all files that changed between two Git commits?
127786
How do I 'git diff' on a certain directory?
25070
Squash my last X commits together using Git
115822
How do you get git to always pull from a specific branch?