... resolve Indicate to git that conflicts are resolved in the specified files ( ... Shows commits that contributed to this conflict git diff --ours Show changes in ... have in something like "git tutorial conflict-resolution" which would run the following ...

git - Carl Worth - Dec 1 2006 - 16:03

... . rerere helps you reuse textual conflict resolution, but fixups needed that do ... and merge in the other, and resolve conflicts there. For example, I have ... . js/mv ... fix textual merge conflicts here. ... compile testing reveals that further ...

git - Junio C Hamano - Jul 31 2006 - 03:19

... that these two files had some conflicts in the contents from the kernel ... - its asking you to manually resolve the conflict. > Did the pull complete and ... these two files - you should see conflict markers of the form <<<<<<<<<<<<<<<< some content ...

git - Alan Chandler - Dec 1 2006 - 03:30

... 23:32:00 -0400 Subject: [PATCH] Added details about resolving conflicts Signed-off-by: Dan ... 126,13 +126,25 @@ After seeing a conflict, you can do two things: up ... . `git diff` would report only the - conflicting paths because of the above 2. and ...

git - Junio C Hamano - Aug 22 2008 - 18:49

... -merging kernel/fork.c CONFLICT (content): Merge conflict in kernel/fork. ... .c Automatic merge failed; fix conflicts and then commit the result ... the net for how to resolve conflicts, seems you should start ... and I just need to resolve this or do I need ...

git - Wink Saville - Dec 1 2006 - 03:06

... the diff context menu, which includes conflict resolution commands instead of Stage Hunk ... Discarding is the only way to resolve conflicts involving symlinks and/or deletion ... Note that the diff shows only conflicting changes. + +%s will be overwritten. + ...

git - Alexander Gavrilov - Aug 30 2008 - 16:55

... the event of a data conflict, and sometimes even in the _absense_ of a data conflict (ie "git commit --amend" to fix ... show differences due to any conflict handling, but a lot of ... all the more interesting ("it resolved differently, but it was an ...

git - Linus Torvalds - Dec 5 2006 - 14:28

... humans in the > event of a data conflict, and sometimes even in the _absense_ of ... will probably show differences > due to any conflict handling, but a lot of the time ... > just all the more interesting ("it resolved differently, but it was > an equally ...

git - Junio C Hamano - Dec 5 2006 - 14:43

... , Wink Saville wrote: > > I then searched the net for how to resolve conflicts, seems you > should start by ... That doesn't look like a conflict. If it had a real conflict, ... that there wasn't actually a conflict at all, but the "merge" program ...

git - Linus Torvalds - Dec 1 2006 - 03:39

... then searched the net for how to resolve conflicts, seems you >> should start by doing a git-diff, so I did ... . That doesn't look like a conflict. If it had a real conflict, ... that there wasn't actually a conflict at all, but the > "merge" program ...

git - Wink Saville - Dec 1 2006 - 03:52

... of assurance. And all merges in linux-2.6.git archive either result in conflict with both 'merge' implementations, or cleanly resolves the same way with both 'merge' implementations. I have not compared the ...

git - Junio C Hamano - Dec 6 2006 - 05:48

... . > > And all merges in linux-2.6.git archive either result in > conflict with both 'merge' implementations, or cleanly resolves > the same way with both 'merge' implementations. I have not > compared the ...

git - Johannes Schindelin - Dec 6 2006 - 06:02

... an interesting illustration. Here is one conflicted hunk from that merge (RCS merge ... one duplicated line after the closing conflict marker? -- 8< -- remerge.sh test script ... --raw "$parent1" HEAD else echo conflicted merge $git ls-files -u ...

git - Junio C Hamano - Dec 5 2006 - 15:50

... ha ha" and returning no conflicts ;-). I have. There is a ... orig new1 Hello world +This conflicts Bye bye world +This does ... not conflict diff --just-made-up orig new2 Hello world +This ... line of new1 will _not_ conflict with xdl_merg( as is, but ...

git - Johannes Schindelin - Dec 2 2006 - 06:49

... 01 December 2006 07:06, Wink Saville wrote: > > Take a look in these two files - you should see conflict markers of the form > <<<<<<<<<<<<<<<< > some content > ================ > some other content > That's what I thought but there isn't any ...

git - Wink Saville - Dec 1 2006 - 03:41

On Thu, 30 Nov 2006, Linus Torvalds wrote: > > So my guess is that there wasn't actually a conflict at all, but the > "merge" program (usually in /usr/bin/merge) returned an error for some > reason. What does "which merge" and "rpm -qf /usr/bin/ ...

git - Linus Torvalds - Dec 1 2006 - 03:53

... 01 December 2006 07:06, Wink Saville wrote: > > > > Take a look in these two files - you should see conflict markers of the > > form <<<<<<<<<<<<<<<< > > some content > > ================ > > some other content > > That's what I thought but there ...

git - Alan Chandler - Dec 1 2006 - 04:10

... working merge-recursive, so it is not like the algorithm is always emitting "boo ha ha" and returning no conflicts ;-). - I haven't benched it to see how much performance is gained by bypassing an extra fork+exec. Among the four patches ...

git - Junio C Hamano - Dec 2 2006 - 03:55

... Ten +weary footsore +wanderers all in a and @@ blub Ten +weird footsore all in a will conflict only for the weary/weird lines, _not_ for wanderers. Besides, my recent patch series was gained exactly by that test. Though ...

git - Johannes Schindelin - Dec 5 2006 - 14:53

... basically use the git-core package. Its at version 1.4.4.1 - so right up to date, and of course resolves all dependencies automatically. Doesn't Ubuntu have git-core in its repository? -- Alan Chandler http://www.chandlerfamily.org.uk - To ...

git - Alan Chandler - Dec 1 2006 - 19:47