Search Results

Search found 1622 results on 65 pages for 'branch'.

Page 24/65 | < Previous Page | 20 21 22 23 24 25 26 27 28 29 30 31  | Next Page >

• Can I tell git pull to overwrite instead of merge?

  - by Michael Stum

  As far as I see, git pull someRemote master tries to merge the remote branch into mine. Is there a way to say "Completely discard my stuff, just make me another clone of the remote" using git pull? I still want to keep my own repository and keep it's history, but I want to have a 1:1 copy of someRemote's master branch after that command.

  Read the article

• Handling file renames in git

  - by Greg K

  I'd read that when renaming files in git, you should commit any changes, perform your rename and then stage your renamed file. Git will recognise the file from the contents, rather than seeing it as a new untracked file, and keep the change history. However, doing just this tonight I ended up reverting to git mv. > $ git status # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: index.html # Rename my stylesheet in Finder from iphone.css to mobile.css > $ git status # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: index.html # # Changed but not updated: # (use "git add/rm <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # deleted: css/iphone.css # # Untracked files: # (use "git add <file>..." to include in what will be committed) # # css/mobile.css So git now thinks I've deleted one CSS file, and added a new one. Not what I want, lets undo the rename and let git do the work. > $ git reset HEAD . Unstaged changes after reset: M css/iphone.css M index.html Back to where I began. > $ git status # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: index.html # Lets use git mv instead. > $ git mv css/iphone.css css/mobile.css > $ git status # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # renamed: css/iphone.css -> css/mobile.css # # Changed but not updated: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: index.html # Looks like we're good. So why didn't git recognise the rename the first time around when I used Finder?

  Read the article

• Best branching strategy when doing continuous integration?

  - by KingNestor

  What is the best branching strategy to use when you want to do continuous integration? Release Branching - Unstable Trunk: or Feature Branching - Stable Trunk: Does it make sense to use both of these strategies together? As in, you branch for each release but you also branch for large features? Does one of these strategies mesh better with continuous integration? Would using continuous integration even make sense when using an unstable trunk?

  Read the article

• Is it possible to push a git stash to a remote repository?

  - by Andrew Grimm

  In git, is it possible to create a stash, push the stash to a remote repository, retrieve the stash on another computer, and apply the stash? Or are my options: Create a patch and copy the patch to the other computer, or Create a minor branch and commit the incomplete work to that branch?

  Read the article

• Using Subversive to move the head back one revision

  - by Fadi Chalfoun

  Using Eclipse/Subversive I commanded it to delete a branch of mine. Unfortunately it also took the liberty of wiping out my trunk folder. SVN isn't my strong suit so I am trying to figure out how to get Subversive to move it's head back one revision so the trunk/branch that was deleted re-appears again. Anyone have any ideas? Thanks!

  Read the article

• git merge should ignore one directory

  - by dorelal

  I have tons of data in directory called reports. While doing git merge with another branch I am getting lots of conflicts for files under reports directory. I would like git merge to ignore files under reports. In another words I would like all the data from reports from master and not from lab branch. Is that possible? This is what I am doing right now. git checkout master git merge lab

  Read the article

• Tracking upstream svn changes with git-svn and github?

  - by Joseph Turian

  How do I track upstream SVN changes using git-svn and github? I used git-svn to convert an SVN repo to git on github: $ git svn clone -s http://svn.osqa.net/svnroot/osqa/ osqa $ cd osqa $ git remote add origin [email protected]:turian/osqa.git $ git push origin master I then made a few changes in my git repo, committed, and pushed to github. Now, I am on a new machine. I want to take upstream SVN changes, merge them with my github repo, and push them to my github repo. This documentation says: "If you ever lose your local copy, just run the import again with the same settings, and you’ll get another working directory with all the necessary SVN metainfo." So I did the following. But none of the commands work as desired. How do I track upstream SVN changes using git-svn and github? What am I doing wrong? $ git svn clone -s http://svn.osqa.net/svnroot/osqa/ osqa $ cd osqa $ git remote add origin [email protected]:turian/osqa.git $ git push origin master To [email protected]:turian/osqa.git ! [rejected] master -> master (non-fast forward) error: failed to push some refs to '[email protected]:turian/osqa.git' $ git pull remote: Counting objects: 21, done. remote: Compressing objects: 100% (17/17), done. remote: Total 17 (delta 7), reused 9 (delta 0) Unpacking objects: 100% (17/17), done. From [email protected]:turian/osqa * [new branch] master -> origin/master From [email protected]:turian/osqa * [new tag] master -> master You asked me to pull without telling me which branch you want to merge with, and 'branch.master.merge' in your configuration file does not tell me either. Please name which branch you want to merge on the command line and try again (e.g. 'git pull <repository> <refspec>'). See git-pull(1) for details on the refspec. ... $ /usr//lib/git-core/git-svn rebase warning: refname 'master' is ambiguous. First, rewinding head to replay your work on top of it... Applying: Added forum/management/commands/dumpsettings.py error: Ref refs/heads/master is at 6acd747f95aef6d9bce37f86798a32c14e04b82e but expected a7109d94d813b20c230a029ecd67801e6067a452 fatal: Cannot lock the ref 'refs/heads/master'. Could not move back to refs/heads/master rebase refs/remotes/trunk: command returned error: 1

  Read the article

• Merging in git: via git-svn, says Already Up-to-date, but git-diff says there are differences

  - by Josiah Kiehl

  I'm using git-svn to work with a codebase and I need to merge changes in trunk to my branch. I have both branches fetched in git, and when I run git diff trunk while in my branch, I can see all the changes. When I run git merge heads/trunk, however, I get a message "Already up-to-date". It's clearly not up to date. What am I doing wrong?

  Read the article

• How do I clone all remote branches with Git?

  - by Peter Coulton

  I have a master and a dev branch, both pushed to github, I've cloned, pulled, fetched, but I remain unable to get anything other than the master branch back. I'm sure I'm missing something obvious, but I have RTM any I'm getting no joy at all.

  Read the article

• Mercurial local branching and pushing to shared repository

  - by Steve Horn

  I created a branch on my local Mercurial repository. I want to push to the shared repository so my work can be backed up, but I don't want other project members to see the branch. What's the standard operating procedure in this case? I'd like to avoid having the repository get full of developer branches that I don't need to see.

  Read the article

• NoMethodError: undefined method `has_attached_file'

  - by mirza

  Paperclip produces this error, after checking out the plugin's rails3 branch. My Gemfile has following line: gem 'paperclip', :git => 'http://github.com/thoughtbot/paperclip.git', :branch => 'rails3' And the error message is: NoMethodError: undefined method `has_attached_file' for #<Class:0x2a50530>

  Read the article

• GUI softwares/netbeans-plugins for creating branches/tags in svn?

  - by ajsie

  hi i wonder if there are some GUI softwares to administrate a svn repo? or do you actually have to log into the ubuntu server with ssh and use all the svn commands to copy the trunk to a branch, merge the data back and forth, copy to a tag, delete and so on. im using netbeans in mac. i think it's only handling the communication between a local project and the repo. not the flows between trunc, branch and tag (creating, deleting, viewing differences etc)

  Read the article

• SNMP: OID to use when writing custom MIBs

  - by justcatchingrye

  If you are writing your own MIB for a bespoke application, is there a 'best practice' for which branch you should use. I'm thinking of something analogous to private IP addresses, that can be used within enterprises, without conflicting with Registered IP addresses I have been asked to make a suggestion, as I advised Application Developers that they should not use OIDs under .1.3.6.1.4.1.111 - This is the Oracle branch

  Read the article

• SVN Command Clean List of Files Changed Between Branches

  - by Travis

  I'm trying to find the proper command in subversion to see a list of all the files that have changed (don't need to see the changes really) between branch/tag A and branch/tag B, etc.

  Read the article

• Git for Local Branches

  - by Rachel

  How can I differentiate between two local branches in git ? How can I copy one local branch to another local branch ? In general how can I perform difference operation between two local branches on my server using git. I tried looking it up online but there is not enough documentation on that or there is not clear documentation on that. Any suggestions or links to useful material would be highly appreciated. Thanks.

  Read the article

• Instrumenting java core libraries

  - by Muneeb

  Hello, When we compile a java program, we get .class files. Can I access these .class files of java core libraries? e.g. can I have access to java.lang.String.class ? Actually I am doing a research and trying to find branch coverage of some java core libraries. The tool I am using for branch coverage actually instruments the .class files. Thanks

  Read the article

• git: import changes form non git repository

  - by takeshin

  Scenario: Local git repo, default master branch FTP server with content of the repo (non git), synchronized daily with the local repo, master branch Workflow: user1 is working on local git repo (git add, working directory clean) user2 (non git user) changed files directly on the FTP server How can I import all files changed on FTP to the local git repo and see what has changed?

  Read the article

• CVS list of files only in working directories

  - by Joshua Berry

  Is it possible to get a list of files that are in the working directory tree, but not in the current branch/tag? I currently diff the working copy with another directory updated to the same module and tag/branch but without the local non-repo files. It works, but doesn't honor the .cvsignore files. I figure there must be an option using a variation of 'cvs diff'. Thanks in advance.

  Read the article

• Mercurial cherry picking changes for commit

  - by mansu

  Say, I made many changes to my code and only need to commit a few of those changes. Is there a way to do it in mercurial? I know that darcs has a feature like this one. I know "hg transplant" can do this between branches, but I need something like this for committing code in the present branch and not when adding change sets from some other branch.

  Read the article

• Move your Working Copy

  - by coffeeaddict

  I tried to find out how to move my working copy. I know SVN move can be used to move files and folders inside your working copy but what about the working copy itself? I want to move it because I created a branch in a folder location that's different from my branch and had updated therefore all my .NET project references. So when I go to merge back to the mainline trunk I get a bunch of tree conflicts.

  Read the article

• Git repository with only remote branches for production

  - by becomingGuru

  On the remote production branch, I don't do any changes, so I don't need any branches. I always want it mirrored to the origin production git checkout origin production works. But, I can't seem to pull after that. Is creating a local branch that tracks the origin production by git checkout -b production --track origin production the only option, or, I'm wondering, if there is any other way.

  Read the article

• Is it possible to create a patch using a set of changelists?

  - by webXL

  Problem: 2 projects shared trunk and were updating some of the same files. Now one project needs to be released, so a new branch was created from a checkpoint before the projects started. I have a list of just my changelist numbers from the mainline. Using that I can generate a list changed files and diff output using a script with a series of 'p4 describe #' commands. Can I reformat that output and apply it to the new branch somehow?

  Read the article

• Error during data UPDATE in php

  - by Piyush

  $sql = "UPDATE tblprofile SET name = '$membername' , f_h_name = '$fathername', maritalS = '$mstatus' , dob = '$dob' , occupation = '$occupation' , nominee = '$nominee' , address1 = '$address1' , address2 = '$address2', city = '$city', district = '$district', state = '$state', pin = '$areapin', mobile = '$mobileno', email = '$email', PANno = '$panno', bankname = '$bankname', branch = '$branch', accountno = '$accountno' WHERE userId = '$_SESSION['UserId']' "; //line 212 if(mysql_query($sql)) { echo "Updation Done."; } Error comes in browser : Parse error: syntax error, unexpected T_ENCAPSED_AND_WHITESPACE, expecting T_STRING or T_VARIABLE or T_NUM_STRING in C:\xampp\htdocs\303\saveEditProfile.php on line 212

  Read the article

• Git: Ignoring certain commits when pushing

  - by int3

  I'd like to have some modifications that are private to my fork. How do I go about doing this? There's a question here about pushing a single commit, and the answer is to cherry-pick the commits you want to push from a private branch and put them on the main branch. However, I would like something more along the lines of ignoring a certain commit when pushing.

  Read the article

• What's the logic flaw in this conditional?

  - by Scott B

  I've created this code branch so that if the permalink settings do no match at least one of the OR conditions, I can execute the "do something" branch. However, I believe there is a flaw in the logic, since I've set permalinks to /%postname%.html and it still tries echo's true; I believe I need to change the ORs to AND, right? if (get_option('permalink_structure') !== "/%postname%/" || get_option('my_permalinks') !== "/%postname%/" || get_option('permalink_structure') !== "/%postname%.html" || get_option('my_permalinks') !== "/%postname%.html")) { //do something echo "true"; }

  Read the article

< Previous Page | 20 21 22 23 24 25 26 27 28 29 30 31  | Next Page >