Situation: You have local uncommitted changes You pull from the master repo You get the error “Checkout conflict with files: xy” Solution: Stage and commit (at least) the files xy Pull again If automerge is possible, everything is ok. If not, the pull merges the files and inserts the merge-conflict markers (<<<<<<, >>>>) Manually edit … Read more
Wow, that was easier than I thought:
Is it possible to set a statement’s output of a batch file to a variable, for example:
I think that Git on Dropbox is great. I use it all the time. I have multiple computers (two at home and one at work) on which I use Dropbox as a central bare repository. Since I don’t want to host it on a public service, and I don’t have access to a server that … Read more
From the git docs: Running git init in an existing repository is safe. It will not overwrite things that are already there. The primary reason for rerunning git init is to pick up newly added templates.
The exact error message is (as illustrated here): Possible cause: proxy settings (as in this thread) setup steps, with Git disabled (as in here)When SourceTree started for the first time, I skipped setting up Git & Mercurial in the wizard. Then I reran the wizard and chose to download and install the embedded packages.But it seems installing those … Read more
You can stash (save the changes in temporary box) then, back to master branch HEAD. Jump Over Commits Back and Forth: Go to a specific commit-sha. $ git checkout <commit-sha> If you have uncommitted changes here then, you can checkout to a new branch | Add | Commit | Push the current branch to the remote. # checkout a new … Read more
This worked for me. It may take 3-5 secs for the prompt to appear just enter your login credentials and you are good to go.
Just calling git rm –cached on each of the files you want to remove from revision control should be fine. As long as your local ignore patterns are correct you won’t see these files included in the output of git status. Note that this solution removes the files from the repository, so all developers would need to … Read more
After installing msysgit I have the Git Bash here option in the context menu in Windows Explorer. So I just simply navigate to the directory and then open Bash right there. I also copied the default Git Bash shortcut to the desktop and edited its Start in property to point to my project directory. It works flawlessly. Windows 7×64, msysgit.