[Commits] [SCM] claws branch, new-rssyl, updated. 3.10.1-50-gd3f4186
andrej at kacian.sk
Fri Jun 13 00:16:07 CEST 2014
On Fri, 13 Jun 2014 00:12:45 +0200
Colin Leroy <colin at colino.net> wrote:
> On 13 June 2014 at 00h11, ticho at claws-mail.org wrote:
> > Conflicts:
> > src/plugins/rssyl/Makefile.am
> > diff --cc src/plugins/rssyl/Makefile.am
> > [...]
> Hmm, is that normal?
I think so - master branch has touched the file (adding the metadata stuff) on
same place as new-rssyl branch touches it (added SUBDIRS line), so git's
diff was confused when I merged changed from master to new-rssyl.
I'm not sure I handled the conflict resolution optimally when it comes to
commit message, though. :)
-------------- next part --------------
A non-text attachment was scrubbed...
Size: 198 bytes
Desc: not available
More information about the Commits