Search Results

Search found 3123 results on 125 pages for 'stacked git'.

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

• 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 (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

• 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

• How to commit my current changes to a different branch in git

  - by Auron

  Sometimes it happens that I make some changes in my working directory and I realize that these changes should be committed in a branch different to the current one. This usually happens when I want to try out new things or do some testing and I forget to create a new branch beforehand, but I don't want to commit dirty code to the master branch. So, how can I make that uncommitted changes (or changes stored in the index) be committed to a different branch than the current one?

  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

• 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

• Sharing code between two different git projects

  - by ripper234

  I have two different .Net projects, hosted on github. I would like to create a shared "commons" library for the two projects. How should I structure my repository to facilitate this sharing? Ideally, a change in this common library in one project could easily be pushed into the other project. I prefer to keep the code itself editable from the two projects (within Visual Studio), and not include it as a library. Are there best practices for this?

  Read the article

• svn ci after a git push on github

  - by Macarse

  I have a project on github but I need to maintain a svn repo updated with every push. I have checked this question but I want to do it automatically. Is there a way to tell github to do a svn ci when a push occurs?

  Read the article

• How do you pronounce Git?

  - by The Matt

  With regards to the version control system, is it pronounced 'get' or 'jit'?

  Read the article

• Rebasing a core repo in git.

  - by b. e. hollenbeck

  I have a customized fork of CodeIgniter that I use as a standard baseline for several projects. Recently, I've made significant improvements in this repo that I want to use to update the client projects that use it. What I can't seem to figure out is how to pull in the changes to a client project. So I have: Baseline: A--B--C--D--E Client cloned @ C C'--D'--E' And I want to update the client repo to E from the Baseline project. I've tried rebase, and it has erased the files not present in the baseline project (views and such), and creates a bunch of conflicts that really don't need to be conflicts with things like the default HTML5 boilerplate that I use. Is there an option for rebase that I should be using? Is there a different way to approach it? Do I need a bunch of .gitignores for the content directories?

  Read the article

• Understanding Git's version control

  - 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

• Branch for each developer in GIT repo

  - by Peter

  I'd like to move my project to GitHub from local svn repository. Multiple developers are curently working on this project. I was thinking that each developer should have their own branch in which they would commit changes. When manager review their work, he will merge it into master branch. I don't want separate repository for each developer as GitHub has limited number of private repositories. Is this a good idea? What are other alternatives?

  Read the article

• How to merge two branches with the Mac OS X git client Gity

  - by Marijn Huizendveld

  I'm having trouble merging two branches with Gity. When I do a checkout on my master branch and click: "Merge into master" nothing seems to happen... Any thoughts?

  Read the article

• GIT core.editor setup on windows along w application PATH reference

  - by delinquentme

  Hey all so i wehnt ahead and opened up my .gitconfig file and manually input the [core] editor = 'C:/Program Files/Notepad++/notepad++.exe' which would allow me to execute command: (im trying to setup my .gitignore list) "C:/Program Files/Notepad++/notepad++.exe" .gitignore im JUSt not interested in typing this out every time that i need to make a file SO ive heard something about editing PATH to allow me to replace the above with something like: npp .gitignore any help would be aprpeciated!

  Read the article

• Git workflow idea to push an unfinished local branch to remote for backup purposes

  - by Zubin

  Say I'm currently working on a new feature which I've branched off of the 'dev' branch and I've been working for several days and it's not yet ready to be merged with 'dev' and pushed. Although I have made several commits and have been pulling changes to dev and then merging dev into my feature branch to keep myself updated. Here's my question. Is it a good idea to push my feature branch to a new branch (with the same name as my local branch) onto origin (say GitHub) just for back-up purposes and later on when it's merged into 'dev' and/or 'master' delete it from origin.

  Read the article

• Git ignore all folders apart from

  - by digital

  I want to ignore all the files in my folder structure apart from the following conditions: profiles (and all folders/files recursive) sites/xxx (and all folders/files recursive) Currently my gitignore file looks like: `*` !sites/xxx !sites/xxx/modules !sites/xxx/modules/* !profiles !profiles/xxx !profiles/xxx/* This doesn't allow me to track sites/xxx/modules/new though, is there anyway round this.

  Read the article

• Git: committed to wrong branch

  - by Sleepycat

  D'oh! I just made a perfectly good commit to the wrong branch. How do I undo the last commit in my master branch and then take those same changes and get them into my upgrade branch? Thanks!

  Read the article

• Adding folders to a git repository while ignoring some subfolders

  - by madmaze

  Im trying to add a directory "foo" to my repo, but there are some sub dirs lets call them "bar1", "bar2", "bar3" and "bar4" Now I want to add foo to my repo, while ignoring foo/bar2 and foo/bar3 is this possible? do i need to add them first and then remove the folders I dont want?

  Read the article

• Git: How to stash only one file out of multiple files that have changed

  - by Rachel

  Hi, How can I stash only one file out of multiple files which are on my branch, is there a way to do so ? Thanks.

  Read the article

• Git, rewrite previous commit usernames and emails

  - by Joseph Silvashy

  I've committed a bunch of commits to a project on Github, however I realized I hadn't set up the proper email and committer full name on the computer I'm currently using to make my commits and therefore the users avatar and email address are not there. How can I rewrite all past commit email and usernames?

  Read the article

• Convert a two-parent commit into a single-parent one in git

  - by Auron

  Oops! It seems I did something wrong the last time I merged two branches in my repository: This was far from what I was expecting. Is there a way to arrange this mess and obtain something like the following? What did I did wrong?

  Read the article

• Git is deleting an ignored file when i switch branches

  - by Max Williams

  I have one branch (let's call it B) that ignores a certain file, which isn't ignored in some other branches (eg branch A). When i switch from branch B to branch A, then back to B again, the file has been deleted. Is this normal? I can sort of see how it would happen, in the sense that branch B thinks it's not there, and branch A thinks that it is, so when i go back to B it 'tidies it away'. But it's kind of annoying. Any suggestions? thanks, max

  Read the article

• git partial pull

  - by KennyTM

  I am maintaining a repository A. Another contributor has cloned A to another repository B. Later, the other contributor added files F, which is irrelevant to me, into B. Now I want to merge changes in B back to A, but without committing F. How to do so?

  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

• Why remote git server should have --bare

  - by dorelal

  I am reading these two articles. However I still do not get --bare option. If the server has no working directory and if a new member of the team clones the project then that person will not get any content. Any further clarification will help on why --bare is needed.

  Read the article

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