Are there any changes regarding merge function in 220.127.116.11 version? I see that "View differences" button from the first Bryan's image is now changed to Merge/View differences but merging thing is not working correctly for me... I get the window with differences.
If you're referring to version 18.104.22.168, you should have that functionality. Since you're using Git as a provider, all actions are done to your local repository -- not to the remote repository, so you'd need to do a pull request before a checkout to make sure you have the most recent versions from the remote repository.
Then I perform check-in, everything is still fine. The problem is when I try to "push to remote". I am unable to do it and I get this in the log.
To xls-v01:bd10/toadteamcoding3.git ! [rejected] master -> master (fetch first) error: failed to push some refs to 'git@xls-v01:bd10/toadteamcoding3.git' hint: Updates were rejected because the remote contains work that you do hint: not have locally. This is usually caused by another repository pushing hint: to the same ref. You may want to first integrate the remote changes hint: (e.g., 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
I am then unable to push or pull, I always get this aforementioned error... Seems to me that Toad is not doing the merge correctly...
Team Coding is doing the merge correctly. The error you're seeing is because there are changes on the remote repository that you don't have in your local repository. Git prefers to work in a "fast forward" mode when doing pulls and pushes, so your local repository should be up-to-date with the remote. So, the best workflow when using Git with Team Coding is something like the following when needing to make a change:
- Do a pull request to pull the latest remote changes down to the local repository.
- Check out the objects you wish to change.
- Make your changes.
- Check in the objects you changed.
- Do another pull request to pull the latest remote changes. (This will merge the remote changes with your local ones.)
- Push your changes to the remote repository.