Review Request: Load merge message saved by git if available

[Milian Wolff]

> On Oct. 14, 2011, 11:29 a.m., Aleix Pol Gonzalez wrote:
> > Interesting change :)
> 
> Sergey Vidyuk wrote:
>     The next chellenge is to make it possible to commit changes in such situation :)
>     
>     Kdevelop always do partial commit while they are not supported at least in case of cherry-pick with conflicts. Haven't tried with merges yet.
> 
> Aleix Pol Gonzalez wrote:
>     Can you send me a formatted patch? then I'll push myself.

ping? can you send us the patch as created by "git format-patch"? please use reviewboard's file-attachement functionality for that.


- Milian


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/102858/#review7329
-----------------------------------------------------------


On Oct. 14, 2011, 9:28 a.m., Sergey Vidyuk wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/102858/
> -----------------------------------------------------------
> 
> (Updated Oct. 14, 2011, 9:28 a.m.)
> 
> 
> Review request for KDevelop.
> 
> 
> Description
> -------
> 
> Load message saved by git in case of conflicts during merge, rebase or cherry-pick
> 
> Depends on the review request https://git.reviewboard.kde.org/r/102857/
> 
> 
> Diffs
> -----
> 
>   plugins/git/gitplugin.cpp 7040c7e 
> 
> Diff: http://git.reviewboard.kde.org/r/102858/diff/
> 
> 
> Testing
> -------
> 
> Manually tested
> 
> 
> Thanks,
> 
> Sergey Vidyuk
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kdevelop-devel/attachments/20120228/d3ac71b8/attachment.html>