Great summation Norm. It does sound like we need very few changes to work with the local repository from Toad. Letting Git handle the push and merge functions,
seems to make perfect sense.
Thanks for the input as always
From: Norm [TeamT] [mailto:bounce-NormTeamT@toadworld.com]
Sent: Monday, July 29, 2013 10:01 AM
Subject: Re: [Toad for Oracle - Discussion Forum] Toad for Oracle 12.0 Team Coding with Git
Re: Toad for Oracle 12.0 Team Coding with Git
Reply by Norm [TeamT]
On 29/07/13 14:21, Stephen Beausang wrote:
In the Git scenario, Toad checks in source to the local version of the
repository and performs diffs etc against this. Git handles merges and
commits. Does this sound about right?
While I’m “on a roll” and haven’t got anything wrong yet!
As far as I can see, Toad would do the normal commit and such like,
based on the local repository. I don’t see any different between using
got and a local one than using something like Subversion and a
(potentially) remote one.
Toad wouldn’t - unless you supplied some more buttons - do the pushes
(and merges) from the local repository (aka branch in Git terms) to the
Git encourages forks, the more the merrier, and unless the user has
privileges to update the master repository, everything happens on the
user’s clone/copy which is help locally.
I suspect that the SCC interfaces for Git will only carry out work at
the local level and anything that the user wishes or needs to do "higher
up the food chain" from their local repository, would need to be done
out side Git.
I don’t know how much Git you know, but I have a repository at
https://github.com/NormanDunbar/PiSound, for example.
If that was Subversion, any changes committed by Toad would go straight
back there. However, with Git, I need to locally clone the above to a
git clone https://github.com/NormanDunbar/PiSound.git
That would create “PiSound” as a new folder, under Git control, with the
contents of the repository inside the folder.
I make changes to the files, add new ones etc, and when done:
git add file_a file_2 …
Even if these files exists in the (local) repository, they will be
“staged” - in whatever state they currently are - ready for a future commit:
git commit [-m “descriptive text”]
and this will commit - to the local repository - everything currently
staged. So far, there’s nothing that Toad cannot handle, I don;t think.
The problem is now, all the changes I have made need to be pushed back
to my Git Hub repository (actually, it’s more complicated than that -
but this is the easy version!)
git push origin master
Will, if no-one else has pushed back before me, push all my committed
changes from my local repository up to the master repository on Git Hub.
If someone else has already pushed their changes, I need to:
git merge origin master
And this is the bit I think needs to be done outside of Toad. Everything
local, Toad should be able to manage, everything higher up than local,
is nothing to do with Toad.
And, of course, it’s not always as simple as the above!
To reply, please reply-all to this email.
Stop receiving emails on this subject.
Unsubscribe from Toad for Oracle - General notifications altogether.
Toad for Oracle - Discussion Forum
this post as spam/abuse.