merge-conflict-resolution

I have made a git repository and added a text file to it. This is 100% for learning purpose. I added "1" to the text file and committed it to master. Created a new branch from master and appended "2". Finally, created a branch from master and appended "3". Could you please explain how a conflict may occur in this, or any other, scenario? VonC You will have a conflict if you merge: branch2 to master (no conflict) branch3 to master (conflict): That is because: The common ancestor would be master (with a second line empty) the source content is branch3 (with a second line including "3") the

Is there a way to resolve conflict for all files using checkout --ours and --theirs ? I know that you can do it for individual files but couldn't find a way to do it for all. Just grep through the working directory and send the output through the xargs command: grep -lr '<<<<<<<' . | xargs git checkout --ours or grep -lr '<<<<<<<' . | xargs git checkout --theirs How this works: grep will search through every file in the current directory (the . ) and subdirectories recursively (the -r flag) looking for conflict markers (the string '<<<<<<<') the -l or --files-with-matches flag causes grep to

I'm using (Windows) SourceTree for my git project. I can do it in either command prompt or Linux terminal. But, I'm wondering whether there is a nice way to interactively and visually resolve conflicts. For example, if pull detects conflicts, popping up a GUI-based conflict tool (e.g., P4Merge). Is it possible? I am always doing manual conflict resolving, which is just painful. This is, for example, a git pull message, from SourceTree. git -c diff.mnemonicprefix=false -c core.quotepath=false pull --no-commit origin master From W:\repo\ * branch master -> FETCH_HEAD Updating 33c07bf..41e0249