> Hello, > is there some way to use vimdiff or a gui tool like meld for merging? > I always end up with the automerged file after update that I have to > edit by hand and that easily becomes messy on bigger changes. I am > used to perforce 3-way merge or the .THIS, .OTHER, .BASE files in > bazaar. The only way I can think of is making a second checkout and > then diffing against my repo with changes. > Am I missing something here? > Petr
Rational ClearCase also does 3-way merges on conflict. I haven't figured out how to get fossil to do similar, but I didn't try very hard. If anyone is curious, basically the idea is that you have three source panes - "this" or the code you're merging from - "other" or the code you're merging to - and "base" or the common ancestor of this and other. Based on these three windows, you can construct a fourth window that contains the desired merged code. I use Beyond Compare 3 for 3-way merges and have been very happy. I would love it if fossil could do 3-way merges, but I'm too busy to contribute right now. RW Ron Wilson, Engineering Project Lead (o) 434.455.6453, (m) 434.851.1612, www.harris.com HARRIS CORPORATION | RF Communications Division assuredcommunications(tm) _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
