P4merge for git bash on windows how to#
P4merge for git bash on windows install#
P4merge for git bash on windows software#
P4merge for git bash on windows code#

Understanding how branching works, how it deals with changes, etc. Again, PLEASE read the section in the book on branching. (You can also check out staging as another play mechanism)Д«UT BE CAREFUL! I canвЂ™t tell you how many times I screwed things up because I didnвЂ™t realize I was on some branch other than my main one. But if you want to play around with something potentially messy it is often much easier to just create a branch and play there. Most folks (including Thali) keep Master as the main branch. Having read that section you understanding that вЂmasterвЂ™ is the default main branch in all Git repositories. If you donвЂ™t understand how Git handles branching then, to be honest, youвЂ™re doomed. Go back to the Git book and re-read the section on branching. What the previous command did was tell your local repository that there is another repository it will know as вЂupstreamвЂ™ (this is the traditional name, just like вЂoriginвЂ™ is the traditional name for your forked repository). Open up the Git Bash shell, navigate to the root of your local repository and type in: To enable that we need to tell your local repository about the master repository. It calls your forked repository вЂoriginвЂ™.Д«ut what about the master repository? As weвЂ™ll discuss below there are times you will need to pull down changes from it. When you cloned your forked repository on your dev box Git understood it was a clone and automatically set up the identity of the forked repository. Forked Repository This is the repository you created by forking the master repository, it starts off as a clone of the master repository Cloned (or local) Repository This is the repository you created on your dev machine, it starts off as a clone of the forked repository Master Repository This is the repository that contains the actual Thali code. There are now three repositories you care about. Now cd into that directory and you are in your own personal depot! This will automatically create a sub-directory whose name is equal to the last part of the path in the URL you copied. Then open up your favorite Git client (on Windows I do this from Git Bash shell) and type in: git clone In your forked project, click on the clone button and copy the https URL there. To do real work however you will need to create a local clone of your forked repository on your dev machine. You are now in your new home for doing your work. Give it some pithy name and a description and hit save. So once you know which of our repositories you need to play with go to their links in codeplex and click on вЂsource codeвЂ™ and вЂforkвЂ™ and select вЂcreate new forkвЂ™.

P4merge for git bash on windows code#

Fork!ДЇor lots of reasons IвЂ™m happy to discuss we want our developers to fork their own version of the code and work there. You have to follow the instructions here to get it to work again.

P4merge for git bash on windows install#

However a problem is that git gui wonвЂ™t вЂњjust workвЂќ after install for some reason. I use the same Git Client as for Windows. If you need to mess around with files directly you can just use the explorer.

Honestly I would just focus on вЂcdвЂ™ and вЂlsвЂ™. вЂdelвЂ™ wonвЂ™t work, you need to use вЂrmвЂ™, etc. So, for example, letвЂ™s say you want to navigate to c: emp. But this shell really wants to think itвЂ™s in UNIX land, not Windows. In most cases itвЂ™s easiest (with a few exceptions IвЂ™ll mention later) to use the Git Bash shell. I use the default options when installing.

P4merge for git bash on windows software#

Software WindowsДЇor Windows I use the Git Client. So please treat this guide as more along the lines of hints and pointers.

P4merge for git bash on windows how to#

So, for example, itвЂ™s pretty much impossible to write a short guide to how to handle basic Git commands for Thali because GitвЂ™s power means that all sorts of things can go wrong. The unfortunate consequence of this power is that easy things are, in my opinion, hard.