Try the latest version. I updated it to interpret unmerged files as modified. So they should be visible in the overview.

from codiad-codegit.

Hi Andreas,

the issue remains unfortunately, please see below:

user1 .git config:

[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[remote "origin"]
url = [email protected]:mygitrepo.git
fetch = +refs/heads/:refs/remotes/origin/
[branch "master"]
remote = origin
merge = refs/heads/master
[user]
name = User 1
email = [email protected]
[branch "dev"]
remote = origin
merge = refs/heads/dev

user2 .git config:

[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[remote "origin"]
url = [email protected]:mygitrepo.git
fetch = +refs/heads/:refs/remotes/origin/
[branch "dev"]
remote = origin
merge = refs/heads/dev
[user]
name = User 2
email = [email protected]

updated one file with string "test5456" with user 1, commited, pushed=>success
updated same file with string "test5457" with user 2, commited, pushed=>error, tried to pull=>error.

Is there any dialog to merge the 2 files with the plugin?

On user 2, the file now displays:

<<<<<<< HEAD

test5457

test5456

6d6e276d962f8a2ca8f74729221f652069c33408

On user 1 it displays:

test5456

I'm using branch "dev" for both users.

Thanks

from codiad-codegit.

If I try to override it on user 2 and update with "test5457" I get the following error when trying to commit:

fatal: ambiguous argument 'countup/design/patterns': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git [...] -- [...]'

from codiad-codegit.

CodeGit doesn't have a dialog to merge 2 files.

I've done the following and it worked:

Now you have to edit your file and decide what parts you want to keep.

Now you have to commit your merged files.

After this I was able to push my changes.
Maybe you want to have a look on my tests: https://github.com/Andr3as/Test

from codiad-codegit.

thanks for the follow up.
When I try to commit the file from user 2, I get the following error:

Would you be able to tell me please in which part of the code is this being run and what git commands will it run so I can compare it via my command line please?

Thanks

from codiad-codegit.

According to this link it could be something to do with quoting: http://superuser.com/questions/273570/git-log-alias-fatal-ambiguous-argument-ad-unknown-revision-or-path

On the command line, running this command works though, not sure it this is being run before the commit?

git log --pretty=format:"myproject/design/patterns" --graph --date=short

It would be good if it had to do with escaping the quotes, that would be simple to solve, I hope

from codiad-codegit.

The same error occurs with the File Get Diff menu.
Could it have to do with the fact that the file has one space in the filename?

Diff
fatal: ambiguous argument 'countup/design/patterns': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git [...] -- [...]'

from codiad-codegit.

Yeah, sounds like it is related with the filename having a space in it. Just tested with another file with no space in the filename and it works.

The file causing an error is named "patterns links.txt". However, the commits and diffs don't pick up the last part of the name.

Do you think you be able to look into it please?

Many thanks

from codiad-codegit.

I moved the second problem to its own issue (#14) and close this question since the merging of file is solved.

from codiad-codegit.

Thanks!

from codiad-codegit.