And finally some functions were defined twice, terrible merge experience that time
The only time I had a problem like this, it was because I had moved the function to another location in the file in branch1, and made changes to the function in its original location in branch 2. This is one of those cases where you have to resolve the merge yourself and if I had merged right away I would have remembered about the move but by the time I actually did the merge, I had forgotten about the move and there were so many other changes, I didn’t notice the duplication until after I committed the merge. Fixing is just a matter of redoing the merge, this time correctly, with the same two parents. If it’s too late to delete the bad merge, simply merge the two merge results and discard all changes from the bad merge. Merges are hard to do correctly when you’ve done major reordering or refactoring of your code. For example, if your routines were D, B, A, C and you’ve reordered them to be A, B, C, D it can be hard to correctly merge with a branch that has D1, B, A1, C. In some cases, it helps if you repeat the reordering on that other branch and commit that so your merge is comparing A, B, C, D to A1, B, C, D1. As for a different merge tool, I use Beyond Compare by http://www.scootersoftware.com/. It isn’t free but they do have a 30-day trial so you can test it out and see if you like it. Merges still have the three main windows but if you really don’t want to see base, you can widen the parent1 & parent2 windows and practically hide it. Mischa Becker Business Systems Analyst Kroger Co 503-797-5459 From: FLORENT Philippe [mailto:[email protected]] Sent: Wednesday, December 09, 2015 10:58 PM To: [email protected] Subject: [thg] FW: alternative to tortoise merge tool Yep,the base file , sometimes it appears, sometimes not, but to me it is an old version that I don’t care and make things really painfull Would be easier to see what’s going on with only 2 windows Well the issue is that my collegue had an ancient version of my code So when I merge with his modifications, instead of having my actual latest code clean, it is all messed up, so I ended up copy pasting my new code And finaly some functions were defined twice, terrible merge experience that time From: Benjamin Fritz [mailto:[email protected]] Sent: mercredi 9 décembre 2015 18:23 To: FLORENT Philippe Cc: [email protected] Subject: Re: [thg] alternative to tortoise merge tool On Dec 9, 2015 7:49 AM, "FLORENT Philippe" <[email protected]<mailto:[email protected]>> wrote: > > Hello, > > > > Is there an alternative to tortoise built in merge tool ? > > Are you talking about kdiff3? I'm pretty sure that's what TortoiseHg comes bundled with, these days. It's one of the best out there. But sure, there are alternatives. Search the web for "3-way merge tool". > > because it is a pain to use and even when I think it is ok, it duplicates > parts of the code > > In the decade or so I've been using kdiff3, I've never had that problem. Can you give an example? > > I am looking for something clear to use and that don’t add an extra 3rd text > window that seems to come from nowhere > Um, do you mean the "base" file? As in, the common ancestor of the two versions of the file you're merging? That's kind of an essential part of doing easy merges in any revision control system, even SVN. Without it, automatic merges are not really possible. > Also if it could display the different branch names that would allow users > not to try figure out which code belongs to who for 5 min > > > Yeah that would be useful, I'd be interested in that as well. ________________________________ This e-mail message, including any attachments, is for the sole use of the intended recipient(s) and may contain information that is confidential and protected by law from unauthorized disclosure. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply e-mail and destroy all copies of the original message.
------------------------------------------------------------------------------
_______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
