Thank You Very much :)
On Oct 26, 3:38 pm, Konstantin Khomoutov wrote:
> On Oct 26, 11:26 am, Chandu80 wrote:
>
> > I have two files rpc-devexprcpseq-nav.rb and readme.txt.
> > My workflow is as follows.
> [...]
> > Auto-merging lib/rpc-devexprcpseq-nav.rb
> > CONFLICT (content): Merge conflict
On Oct 26, 11:26 am, Chandu80 wrote:
> I have two files rpc-devexprcpseq-nav.rb and readme.txt.
> My workflow is as follows.
[...]
> Auto-merging lib/rpc-devexprcpseq-nav.rb
> CONFLICT (content): Merge conflict in lib/rpc-devexprcpseq-nav.rb
> Auto-merging readme.txt
> CONFLICT (content): Merge c
