User Tools

Site Tools


doxygen

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
doxygen [2017/08/11 17:54]
reuk [Set up the merge driver] Suggest renaming files so that they don't clash
doxygen [2017/08/11 18:07] (current)
mbrain
Line 3: Line 3:
 The problem is that any comments you've modified or added will be in the wrong style. The approach described below means your comments will appear in git history to have always been Doxygen and should avoid hairy merges of modified comments. The problem is that any comments you've modified or added will be in the wrong style. The approach described below means your comments will appear in git history to have always been Doxygen and should avoid hairy merges of modified comments.
  
-The "​magic"​ approach involves setting up a custom merge driver in git that for each merge conflict ​and runs the reformatting script on all 3 parts of the merge (local, remote, ancestor) before attempting the merge. This should allow for rebase action that is no more complex that it would be without the Doxygen change. This will overwrite files without warning, so proceed with caution (i.e. **back up your branch**).+The "​magic"​ approach involves setting up a custom merge driver in git.  For each merge conflict ​it runs the reformatting script on all 3 parts of the merge (local, remote, ancestor) before attempting the merge. This should allow for rebase action that is no more complex that it would be without the Doxygen change. This will overwrite files without warning, so proceed with caution (i.e. **back up your branch**).
  
 ===== Set up the merge driver ===== ===== Set up the merge driver =====
doxygen.txt ยท Last modified: 2017/08/11 18:07 by mbrain