[MonoDevelop] Glade question

John Luke jluke@users.sourceforge.net
Sat, 24 Jan 2004 12:19:25 -0500

On Sat, 2004-01-24 at 20:18 +1100, John BouAntoun wrote:
> Guys,
> I did some work on a dialog and gladed it up. Then i did a svn up and
> found that someone else had checked in changes to the Base.glade file.
> Is there a quick way to move my dialog from Base.glade.mine to
> Base.glade.r625 ? I don't want to have to go and re-create it again.
The easiest way is to manually merge your changes, unless svn has some
built in conflict tools that I am not aware of yet.