Merge Operation in Git-cola - Help

[Gnana14]

Hi,

First i would like to thank david & co for a such a nice tool.
Im new to git-cola.

i have two branches
master
main

main is created from master version and modified 2 lines to get
conflict after main branch creation!

I am in master branch now.
When i choose Merge-local merge
merge window shows merge in to master (correct)

i selected local branch - main branch after that nothing happens
except thismessage:
-v, --verbose be more verbose
-q, --quiet be more quiet
in terminal, i get this:
cannot open <FOLDER_PATH>/.git/FETCH_HEAD

can anyone help me in this?

Do we have a documentation for merge?
http://cola.tuxfamily.org/share/doc/git-cola/html/index.html
above link is good for other operations.

I am using git-cola version is: v1.3.8

Please also note that when i try to do git merge (via terminal it
works as expected!)
Thanks in advance.

--
To unsubscribe from this group an send email to git-cola+u...@googlegroups.com
For more information about this group visit http://groups.google.com/group/git-cola?hl=en

[David Aguilar]

On Wed, Apr 14, 2010 at 11:46:31PM -0700, Gnana14 wrote:
> Hi,
>
> First i would like to thank david & co for a such a nice tool.
> Im new to git-cola.

Thanks

> i have two branches
> [...]

> in terminal, i get this:
> cannot open <FOLDER_PATH>/.git/FETCH_HEAD
> can anyone help me in this?
>

> I am using git-cola version is: v1.3.8

Try the latest from github ;) I'm pretty sure It's fixed there.
There will be a new release soon after I can catch up on
documentation (patches always welcome).

Are you on linux? git-cola is really easy to hack and run
from its git repo on fedora, debian, ubuntu, etc.

--
David

[Gnana14]

Hi David,

I installed the latese one avail in this site ( v1.4.1.2) :
http://github.com/davvid/git-cola/downloads

from terminal i issued the following command to install :
make install

I am using ubuntu 9.10.

When i tried to merge from git-cola,

in command output,i got logs as follows:

Sat Apr 17 10:57:18 2010
usage: git merge [options] <remote>...
or: git merge [options] <msg> HEAD <remote>

-n do not show a diffstat at the end of the
merge
--stat show a diffstat at the end of the merge
--summary (synonym to --stat)
--log add list of one-line log to merge commit
message
--squash create a single commit instead of doing a
merge
--commit perform a commit if the merge succeeds
(default)
--ff allow fast forward (default)
-s, --strategy <strategy>
merge strategy to use
-m, --message <message>
message to be used for the merge commit (if
any)

-v, --verbose be more verbose
-q, --quiet be more quiet

Am i missing (as a input to cola) something while performing merge
operation?

I also saw your quick commit on "gitcmds: Fix merge_message() when
FETCH_HEAD doesn't exist ".

Thanks.

Br,
Ragavendran R

[David Aguilar]

On Sat, Apr 17, 2010 at 02:10:25AM -0700, Gnana14 wrote:
>
> Hi David,
>
> I installed the latese one avail in this site ( v1.4.1.2) :
> http://github.com/davvid/git-cola/downloads

Sorry, by "github" I meant the latest in the master branch.

There will be a v1.4.2 soon, I just need to write a bit more
documentation before tagging it.

> from terminal i issued the following command to install :
> make install

By default that installs to $HOME/bin/git-cola,
so make sure you run it using the full path.

> Am i missing (as a input to cola) something while performing merge
> operation?
>
> I also saw your quick commit on "gitcmds: Fix merge_message() when
> FETCH_HEAD doesn't exist ".

Yes, that should help. v1.4.1.2 doesn't have that, though..
it's only in 'master' right now.

Thanks for your patience,