Right-Click on Cloned Git folder
Select "TortoiseGit"-->"Check for modifications"
Screen comes up showing my changes but screen has no "Check Repository" (or "Check Origin/Master") button
In TortoiseSVN I used this feature ALL THE TIME to see if I needed to do an "SVN Update" prior to doing an "SVN Commit". How can I see if there were any other changes done to the REMOTE since my clone (i.e. do I need to do a GIT PULL before I do my Commit+Push).
Related
pushing to github was working fine. I think this problem started when i checked out a branch from github. How do i fix this? When i try to push to github now, i get the error "The current branch could not be determined."
Also, all my local commits do not show up with comments in either of my local branches. at least not in xcode 9 UI. I don't really know how to use the local git to check these things, so if someone wants to point me to documentation that would be helpful too.
I had this issue, you need to get down and dirty in Terminal :)
The issue is most likely a detached HEAD
This recovery is based on you have made changes whilst head detached and you want to keep these changes.
Navigate to your project directory and execute: git status
If you have a HEAD detached message then:
Commit changes: git commit -a -m "you commit comment here"
Create a local temp branch: git branch temp
Check out the previous branch (the branch you want to use i.e. master): git checkout master
now merge your recent changes (from the temp branch): git merge temp
Your all done, go back into Xcode and your back on your branch and everything as you left it :)
Hope this helps.
Type these commands (1-4) sequentially in your Command Prompt :
git commit -a -m "you commit message here"
git branch temporary
git checkout master
git merge temporary
Now head over to source control navigator pane in your Xcode project and delete the "temporary" branch from Branches Tab
Source Control navigator pane image
I had the same issue after checking out a previous commit and have found a fix.
In Xcode go to Source Control > Clone > Clone the repository you are trying to push and save it, then delete your old Xcode project and replace it with the cloned project and it should work as normal.
i wanted to know how we can do version controlling directly from UFT with gitHUB,
how to get GitHub controls visible on UFT 14.1 version tool?
Thanks
Raju
Copied directly from UFT 14.01 help documents:
Set up UFT to work with GIT
Before using GIT inside UFT you must configure GIT locally:
Install the GIT or SVN client on the computer running UFT.
Set up your GIT workspace on your computer. For details on see your GIT documentation.
In UFT, create the test and save it in the folder configured to work with GIT or SVN.
Add the document to your repository in GIT or SVN using the standard GIT and SVN commands.
When prompted, enter your user credentials:
GIT
You are prompted for your user credentials the first time you push to the remote repository.
Note:
If you need to clear your user credentials, select Tools > Clear All Credentials. Your user credentials for the SVN or GIT repository are removed and you will be prompted to enter them on the next update or commit.
After you set up the workspace and add a document to the workspace, the relevant icons are displayed in your testing documents in the Solution Explorer and you can use GIT commands for your documents directly from the Solution Explorer.
Check this link for more detailed information.
before i was able to 'commit & sync' (button) my new changes from my local repo to remote. Now i have 2 new commits but i only see Commit to Develop. Is there something wrong?
The "Commit and Sync" button is activated from the Edit menu, by checking the "Automatically Sync after Committing" entry.
This option is only available on Mac OSX.
We have an in-house TFS 2013 update 4 on Windows Server 2008 R2 Standard (TFS server), with Git version 2.5.0.windows.1.
Our TFS build process uses InvokeProcess activity to call Git from a batch file.
These are the calls to git we make from the batch file (in two lines for debugging purposes):
call git submodule init
call git submodule update
It is the second line that is giving me a problem, as shown below:
When I run the same batch file on the server manually (even from non-admin cmd.exe), all executes as expected, i.e. I am not prompted for any usernames or passwords.
We are currently using wincred as our credentials helper, having tried:
winstore,
git-credential-store,
adding generic windows credentials via Credentials Manager (tried both git:http://xxxxxx:8080 and just http://xxxxxx:8080).
setting credentials in .gitconfig globally and per repo.
Interestingly, Microsoft.TeamFoundation.Build.Activities.Git.GitPull has no problems cloning the superproject, but if I was to prompt Git to clone and pull via a batch file, I am getting the same "fatal: could not read Password" error.
Unfortunately, we do not have an option of upgrading to TFS 2015, where loading submodules is apparently a matter of ticking a check-box. Including username and password as part of the command in plain text is not an option either.
What do I need to try/do to allow Git to read the required Password using wincred?
All thoughts and suggestions will be much appreciated...
The main problem was the fact that our TFS Build service was running under NETWORK SERVICE account, as opposed to the account which I was entering passwords for.
Steps that I took towards the solution (as alternative to using TFS Admin Console):
On TFS Server, go into Services (services.msc), and locate "Visual Studio Team Foundation Build Service Host 2013" service among "Services (local)".
Right-click on the service, and on "General" tab click "Stop"
On "Log On" tab, select "This account" and enter the details of the account you validated with wincred (it is assumed that this account exists under "Project Collection Build Service Accounts" and has all the required rights for your repos).
Take note of the email address as it is displayed after "Check names" has been clicked.
Click "Apply"
Back on the "General" tab, click "Start".
Do the same for "Visual Studio Team Foundation Background Job Agent" service (I did that for consistency with the build service).
A few more points worth checking:
In your user account directory on TFS Server, ensure that the email address you saw after "Check names" in step 4 matches the email address used in the 'email' field under [user] in .gitconfig.
Ensure you get prompted for credentials at some point by wincred (I did that by running "git config credential.helper store" first, then running "git config credential.helper wincred" (if you want to do "git config --global credential.helper store", followed by "git config --global credential.helper wincred", then you'll need to run your cmd.exe with elevated permissions).
In my case the correctly saved credentials looked like this (in Credential Manager, under "Generic Credentials") - notice the absence of a username:
Hope this helps somebody with the same issue!
I come to you because I have this really annoying issue. In xCode, I deleted some files and now, when I want to push my sources, it says that I can't since there is some uncommitted change. The uncommitted change come from the deleted files (xcode shows me these files marked with a d).
My question is how I make my git repo sync with it so I can push my sources ??
In addition to the answer of triad:
Select your project in the Project Navigator
Select under the File menu->Source Control->Commit
Select under the File menu->Source Control->Push (if you want to push it to a remote repo)
On the Mac it helps to research the items under the menu bar, as the popup menu is not always populated fully.
You need to commit your changes before you push onto your remote. If you go to your project directory, type:
git status
It should show you the files which have been deleted. If it looks okay to you, type:
git commit -a -m "your commit message here"
Then you should be able to push to your remote repo:
git push <remote> <remote_branch>