Following the thread "MSEgit in sak project" here how to use git merge with
MSEgit, specificially for sak.
- Install kdiff3 and kompare from your Linux distribution.
- 'git'-'Fetch all' in order to get the current state of the remote
ropositories.
- Checkout your working branch -> click in "develop"-'C' column.
- Click in "mseremote"-"mse"-'L' colomn, the differences will be showed
(merge1.png).
- RightClick-'Merge remote Branch' in "mseremote" "mse".
- Because I merged your master branch before I made changes it is a
simple "Fast-forward", no changes need to be merged and no merge commit is
necessary. Click in "master" 'L' column, the differences between
the "develop" and the "master" branch will be listed (merge2.png).
- RightClick in left panel in the diff window, select 'Difftool'. Kompare will
be started, on the left side is the "master" version, on the right side
the "develop" version (merge3.png).
- If you want to restore text of the "master" version click "Apply
Difference".
Please play with the tool.
=> Many thanks Martin. i will play with it this night.
Hum, could you change/add something in your code so the game is more funny?
Fre;D
Martin
------------------------------------------------------------------------------
Monitor 25 network devices or servers for free with OpManager!
OpManager is web-based network management software that monitors
network devices and physical & virtual servers, alerts via email & sms
for fault. Monitor 25 devices for free with no restriction. Download now
http://ad.doubleclick.net/ddm/clk/292181274;119417398;o
_______________________________________________
mseide-msegui-talk mailing list
mseide-msegui-talk@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mseide-msegui-talk
------------------------------------------------------------------------------
Monitor 25 network devices or servers for free with OpManager!
OpManager is web-based network management software that monitors
network devices and physical & virtual servers, alerts via email & sms
for fault. Monitor 25 devices for free with no restriction. Download now
http://ad.doubleclick.net/ddm/clk/292181274;119417398;o
_______________________________________________
mseide-msegui-talk mailing list
mseide-msegui-talk@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mseide-msegui-talk
