Every time I see a conflict on something like imports or method signature changes (e.g. renames of variables) in my SCM I wonder if there is something like a language aware diff/merge method that can handle the more annoying small changes that can happen on a shared project. Is there anything out there that handles conflicts more smoothly, working in a Unix environment?
5 Answers
doesn't git rebase solve this problem? any variable renames will be accounted for in the associated commits. git rebase lets you stay in sync with upstream commits. as long as you rebase frequently (daily ish?) you shouldn't be getting stupid conflicts like that, and if you are, they are probably real conflicts and not solvable by a java grammar parser.
Related