Search Results

Search found 2967 results on 119 pages for 'git stash'.

Page 45/119 | < Previous Page | 41 42 43 44 45 46 47 48 49 50 51 52  | Next Page >

• Azure git deployment - missing references in 2nd assembly

  - by Dan

  I'm trying to setup Bitbucket deployment to an Azure website. I successfully have Bitbucket and Azure linked, but when I push to Bitbucket, I get the following error on the Azure site: If I click on 'View Log', it shows the following compile errors: D:\Windows\Microsoft.NET\Framework\v4.0.30319\Microsoft.Common.targets(1578,5): warning MSB3245: Could not resolve this reference. Could not locate the assembly "System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL". Check to make sure the assembly exists on disk. If this reference is required by your code, you may get compilation errors. [C:\DWASFiles\Sites\<projname>\VirtualDirectory0\site\repository\<projname>.Common\<projname>.Common.csproj] D:\Windows\Microsoft.NET\Framework\v4.0.30319\Microsoft.Common.targets(1578,5): warning MSB3245: Could not resolve this reference. Could not locate the assembly "WebMatrix.WebData, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL". Check to make sure the assembly exists on disk. If this reference is required by your code, you may get compilation errors. [C:\DWASFiles\Sites\<projname>\VirtualDirectory0\site\repository\<projname>.Common\<projname>.Common.csproj] CustomMembershipProvider.cs(5,7): error CS0246: The type or namespace name 'WebMatrix' could not be found (are you missing a using directive or an assembly reference?) [C:\DWASFiles\Sites\<projname>\VirtualDirectory0\site\repository\<projname>.Common\<projname>.Common.csproj] CustomMembershipProvider.cs(9,38): error CS0246: The type or namespace name 'ExtendedMembershipProvider' could not be found (are you missing a using directive or an assembly reference?) [C:\DWASFiles\Sites\<projname>\VirtualDirectory0\site\repository\<projname>.Common\<projname>.Common.csproj] Models\AccountModels.cs(3,18): error CS0234: The type or namespace name 'Mvc' does not exist in the namespace 'System.Web' (are you missing an assembly reference?) [C:\DWASFiles\Sites\<projname>\VirtualDirectory0\site\repository\<projname>.Common\<projname>.Common.csproj] CustomMembershipProvider.cs(198,37): error CS0246: The type or namespace name 'OAuthAccountData' could not be found (are you missing a using directive or an assembly reference?) [C:\DWASFiles\Sites\<projname>\VirtualDirectory0\site\repository\<projname>.Common\<projname>.Common.csproj] Models\AccountModels.cs(40,10): error CS0246: The type or namespace name 'Compare' could not be found (are you missing a using directive or an assembly reference?) [C:\DWASFiles\Sites\<projname>\VirtualDirectory0\site\repository\<projname>.Common\<projname>.Common.csproj] Models\AccountModels.cs(40,10): error CS0246: The type or namespace name 'CompareAttribute' could not be found (are you missing a using directive or an assembly reference?) [C:\DWASFiles\Sites\<projname>\VirtualDirectory0\site\repository\<projname>.Common\<projname>.Common.csproj] Models\AccountModels.cs(73,10): error CS0246: The type or namespace name 'Compare' could not be found (are you missing a using directive or an assembly reference?) [C:\DWASFiles\Sites\<projname>\VirtualDirectory0\site\repository\<projname>.Common\<projname>.Common.csproj] Models\AccountModels.cs(73,10): error CS0246: The type or namespace name 'CompareAttribute' could not be found (are you missing a using directive or an assembly reference?) [C:\DWASFiles\Sites\<projname>\VirtualDirectory0\site\repository\<projname>.Common\<projname>.Common.csproj] Note that these compile errors are against another assembly in my project (the assembly where I put the business logic). When Googling, the only mention I found was about having to set the "local copy" flag to true for those references. I've tried this, but still got the same errors. This all compiles fine locally. Any ideas?

  Read the article

• Git ignore sub folders

  - by Marcel

  I have a lot of projects in my .Net solution. I would like to exclude all "bin/Debug" and "bin/Release" folders (and their contents), but still include the "bin" folder itself and any dll's contained therein. .gitignore with "bin/" ignores "Debug" and "Release" folders, but also any dll's contained in the "bin" folder. "bin/Debug" or "bin/Release" in the .gitignore file does not exclude the directories, unless I fully qualify the ignore pattern as "Solution/Project/bin/Debug" - which I don't want to do as I will need to include this full pattern for each project in my solution, as well as add it for any new projects added. Any suggestions?

  Read the article

• What is the best Git GUI on OSX?

  - by sanity

  What is the best GUI on OSX for viewing a repository, and (optionally) manipulating it?

  Read the article

• Git - tidying up a repo

  - by Simon Woods

  Hi I have got my repo into a bit of a state and want to be able to work my way out of it The repo looks a bit like this (A1, B1, C1 etc are obviously commits) A1 ---- A2 ---- A3 ---- A4 ---- A5 ---- A6 ---- A7 ---- A8 / (from a remote repo) B1 ---- B2 --------------------------------- | \ \ C1 ---------------------------------C2 \ / D1 --- D2 --- D3 --- D4 --- D5 --- D6 Ideally I'd like to be able to remove all the revisions (with rebase?) on the B, C and D lines (I'm loathed to say branches simply because there are now no local branches on these lines except ref branches to the remote repo) and try to merge in the remote repo again, perhaps in a better way. I'd be grateful of any suggestions as to how to get rid of all these commits. Could I ask that any answers use revision SHA1s rather than branch names. I thought that somehow I'd be able to revert the merge into A7 but can't quite work out how to do it I hope that is sufficient information. Many thx Simon

  Read the article

• git strategy to have a set of commits limited to a particular branch

  - by becomingGuru

  I need to merge between dev and master frequently. I also have a commit that I need to apply to dev only, for things to work locally. Earlier I only merged from dev to master, so I had a branch production_changes that contained the "undo commit" of the dev special commit. and from the master, I merged this. Used to work fine. Now each time I merge from dev to master and vice versa, I am having to cherry-pick and apply the same commit again and again :(. Which is UGLY. What strategy can I adapt so that I can seamlessly merge between 2 branches, yet retain some of the changes only on one of those branches?

  Read the article

• Git - Ignore certain files contained in specific folders

  - by Jim

  I'm using msysgit and have a project tree that contains many bin/ folders in the tree. Using the .gitignore file in the root of the project I need to ignore all .dll files that reside within a bin/ folder anywhere in the project tree. I've tried "bin/*.dll" but that doesn't work, I assume it is only working against the bin/ folder in the root of the project.

  Read the article

• How to deploy code using git

  - by luckytaxi

  I have a bare repository initialize on my webserver. I code on my workstation and I'm able to push/pull/commit changes to it. Now, I want to deploy this code on the webserver but into my apache directory (/var/www/html). If I wanted to track the changes (only pull no push) from this directory, should I clone the repo first? This way I can make changes locally, then commit and push to "central repo" and then pull from the documentroot folder to see the changes in "prod."

  Read the article

• Svn or git any pros and cons?

  - by Igor

  Any brief PRO and CONTRA for both of the version control systems.

  Read the article

• Manual hunk editing in git interactive mode

  - by kRON

  In manual hunk edit mode, the docs say this: # To remove '-' lines, make them ' ' lines (context). # To remove '+' lines, delete them. # Lines starting with # will be removed. What I don't understand is how to remove '-' lines. Say if I had had this bit of code: Alfa Bejta And I've edited it in my working tree to: Alpha Beta The diff is: - Alfa - Bejta + Alpha + Beta How do I edit the hunk to only commit the modifications to the first line? I've tried these: - Alfa Bejta + Alpha - Alfa + Alpha Bejta to no avail.

  Read the article

• Git: delete files in a branch, what happens when a merge takes place

  - by Josh

  I'm relatively new to source control (at least complex source control). If I'm developing a set of features in a branch, and I happen to delete some cruft out of the source tree in this branch, what happens when I merge? Are the files properly deleted in the trunk/master? Is there anything I should avoid doing that is typically problematic when developing in a branch? This is a 2-3 developer system, so we're not talking about massive changes to source. I'm told you should pull from the trunk often to avoid tangled manual merge situations, and this makes sense. Thanks, Josh

  Read the article

• Does Mercurial have an equivalent to git clean?

  - by Erik B

  hg clean does not seem to exist, which kinda bothers me. Is this a feature that Mercurial doesn't have or did they just name it differently?

  Read the article

• Reverting a single file to a previous version in git

  - by georgeliquor

  Is there a way to go through different commits on a file. Say I modified a file 5 times and I want to go back to change 2, after I already committed and pushed to a repository. In my understanding the only way is to keep many branches, have I got that right? If I'm right I'm gonna have hundreds of branches in a few days, so I'm probably not understanding it really. Could anyone clear that up please?

  Read the article

• Using GIT with Joomla

  - by kwhohasamullet

  Hi Guys, We are a web design company going down the road of setting up a revision management system and all the processes around how we are going to use it etc. We mainly develop our websites on a Joomla and what i wanted to know is how other companies manage their repositories when dealing with a CMS. We mainly deal with template building as well as occasionally customising components/plugins we installed. My main questions are: -Is the best way to store all files (including the Joomla files) in the repo or just files that you make/ change yourself? -Do you keep a copy of the Database somewhere to account for database changes Thanks in advance

  Read the article

• Programmatically printing git revision and checking for uncommitted changes

  - by Andrew Grimm

  To ensure that my scientific analysis is reproducible, I'd like to programmatically check if there are any modifications to the code base that aren't checked in, and if not, print out what commit is being used. For example, if there are uncommitted changes, it should output Warning: uncommitted changes made. This output may not be reproducible. Else, produce Current commit: d27ec73cf2f1df89cbccd41494f579e066bad6fe Ideally, it should use "plumbing", not "porcelain".

  Read the article

• What is the HEAD in git?

  - by e-satis

  There seems to be a difference between the last commit, the HEAD and the state of the file I can see in my directory. What is HEAD, what can I do with it and what mistake should I avoid?

  Read the article

• Simple github fetch/merge not pulling in remote branch?

  - by chum of chance

  I have a project I forked on github to my repository. I made changes on the "experiment" branch of the project the committed the project to my fork. If you go to my branch on Github you can see the that the experiment branch was correctly committed. I would like to merge the experiment branch with the original repo (which I have rights to). I issued the following commands: git clone [email protected]:originalrepo/theproject.git git checkout -b experiment origin/experiment cd theproject git remote add experiment [email protected]:chumofchance/theproject.git git fetch experiment git merge experiment "Already up to date" However, when I view the project in explorer, it appears that nothing has changed. Am I screwing something up in regards to fetching the experiment branch (vs the master branch)?

  Read the article

• Git: Finding what branch a commit came from

  - by Ethan Gunderson

  I'm pretty sure this isn't possible, but is there anyway to find out what branch a commit comes from given its sha1? Bonus points if you can tell me how to accomplish this using grit. :)

  Read the article

• Git tool to remove lines from staging if they consist only of changes in whitespace

  - by Max Howell

  The point in removing trailing whitespace is that if everyone does it always then you end up with a diff that is minimal, ie. it consists only of code changes and not whitespace changes. However when working with other people who do not practice this, removing all trailing whitespace with your editor or a pre-commit hook results in an even worse diff. You are doing the opposite of your intention. So I am asking here if there is a tool that I can run manually before I commit that unstages lines from staging that are only changes in whitespace. Also a bonus would be to change the staged line to have trailing whitespace removed for lines that have code changes. Also a bonus would be to not do this to Markdown files (as trailing space has meaning in Markdown). I am asking here as I fully intend to write this tool if it doesn't already exist.

  Read the article

• How should I structure my git commits?

  - by int3

  I'm trying to contribute to open source software for the first time, but I'm pretty inexperienced with version control systems. In particular, right now I want to make a number of changes to different parts of the code, but I'm not sure if the maintainer would want to integrate all of them into the master repository. However, the changes I'll be making are independent, i.e. they affect different parts of the file, or parts of different files. How should I go about making the changes? If I make a string of commits on the same branch, will the maintainer be able to pick and choose what he wants from the individual commit? E.g. can he patch in the changes I made in my second commit while ignoring the first one? Or should I make each change in a separate branch?

  Read the article

• Git: removing selected commits from repository

  - by xk0der

  I would like to remove selected commits from a linear commit tree, so that the commits do not show in the commit log. My commit tree looks something like: R--A--B--C--D--E--HEAD I would like to remove the B and C commits. So that they do not show in the commit log, but changes from A to D should be preserved. Maybe by introducing a single commit, so that B and C become BC and the tree looks like. R--A--BC--D--E--HEAD Or, ideally, after A comes D directly. D' representing changes from A to B, B to C and C to D. R--A--D'--E--HEAD Is this possible? if yes, how? Some notes that might be helpful: This is a fairly new project so has no branches as of now, hence no merges as well. Side note: It's a personal project, so no, I'm not trying to destroy any evidence :)

  Read the article

• git (any SCM) and compiling object files, switching branches, physiology thereof

  - by IanVaughan

  If I compile branch A, then switch to branch B, compile, and switch back to branch A. All the object files touched by the compile of branch B have to be recompiled! Normally one does not check-in object files, but there seems little choice here. What are the ideal working practices here?

  Read the article

• Git Submodule or fork

  - by Eric

  I have a private repo in github that is the complete source code to my cms. Now I have a few local customers that I want to use the same code base on but with different themes. Is it better to fork the original project out into a repo for each one. Or use a submodule and create a new repo for each customer? After each site is complete I would imagine the theme files wouldn't change much but would need to pull in changes from the main repo when bugs are discovered.

  Read the article

• Git: Run through a filter before commiting/pushing?

  - by martiert

  Hi. Is there a way to run the changed files through a filter before doing the commit? I wish to make sure the files follows the coding standards for the project. I would also like to compile and run some test before the commit/push actually takes place, so I know everything in the repo actually works.

  Read the article

• How do I fix these spurious git commits?

  - by James Wenton

  I made an error when I was working and wound up with a commit tree I didn't want. Right now, things look like this: [master] A -- B -- C -- D \ \ C' -- D' [HEAD] I want to wind up like this: [master, HEAD] A -- B -- C -- D How do I get there from here?

  Read the article

• Syncing two GIT branches that only differ by a couple of files

  - by Oliver Weichhold

  I have a couple of branches defined for the current project where all but the master branch differ from master only by the same small set of files (less than ten). After implementing a new feature in master I would like to replicate those changes and additions to the other branches with the least effort. What's the recommended approach here?

  Read the article

< Previous Page | 41 42 43 44 45 46 47 48 49 50 51 52  | Next Page >