Questions about git-merge-conflict
Read more about git-merge-conflict
python (65.1k questions)
javascript (44.2k questions)
reactjs (22.7k questions)
java (20.8k questions)
c# (17.4k questions)
html (16.3k questions)
r (13.7k questions)
android (12.9k questions)
Improve git's suggestions for merge conflicts of adjacent hunks?
Related to my previous question Git merge conflict upon rebasing adjacent deletion and insertion?
By default, git's merge algorithm can give dangerous/unhelpful suggestions.
For instance, I have somet...
kdb
Votes: 0
Answers: 0
How not to have pull requests from one team member on GitHub overwrite my own CSS file?
Currently, I'm working on a PHP project with three team members on GH. We split up tasks, but came to the conclusion that when contributor1 codes one screen and styles it in our CSS file, this will al...
Rix11
Votes: 0
Answers: 1
Problem after git merge: unable to pull because unfinished merge and no staged files
I have merged a branch to master on GitHub and wanted to do a git pull locally after that. When I did a git pull it asked me to commit changes, so I have added files and committed.
But something happe...
seven
Votes: 0
Answers: 1
Git merge keep and commit conflicted state
I found some solutions to force an overwrite using ours or theirs strategies, but is there a way to just commit the merge in the conflicted state?
Before you ask why it's not for me, I'm just doing it...
mclslee
Votes: 0
Answers: 1