Questions about git-merge-conflict
Read more about git-merge-conflict
python (12.9k questions)
javascript (9.2k questions)
reactjs (4.7k questions)
java (4.2k questions)
java (4.2k questions)
c# (3.5k questions)
c# (3.5k questions)
html (3.3k questions)
Git merge with renames on one and same changes (formatter) on both sides
I've got two long living branches develop and next, where every commit in develop has to be in next as well.
The files in next have been moved to different folders.
Now I want to apply a formatter on ...
chkpnt
Votes: 0
Answers: 0
How to fix merge conflict that involves commenting out one line, and un-commenting another?
I wanted to comment out <AppNavigator /> and un-comment <OnboardingNavigator />. Can someone explain why this is a merge conflict and how to resolve it? This is when I'm trying to do a PR ...
gkeenley
Votes: 0
Answers: 1
Detect same lines when git merge results in confict
I have a branch A and two child branches B1 and B2, that were created from it.
If I add single text/code line to a file in branch B1 and commit that change, then add the same line to the same file in ...
vladllen
Votes: 0
Answers: 1
Resolving only some files in a git merge conflict
What if there's a merge conflict with two files.
Only person A is familiar with file A
and only person B is familiar with file B
I'm new to git.
So would it be possible for person A to resolve the con...
Steve Waters
Votes: 0
Answers: 3