version-control

问题 I'm trying to manage a pull request on a repo that I don't own but have admin rights on. When I attempt to pull in changes from another fork, it fails with an error that is less than clear. Here is my workflow... Fork main repo Make changes in that fork Commit to that fork 3.5 (goto step 2) Submit a pull request to the main repo As an administrator of the main repo, I'm attempting to merge those changes as follows... git clone git@github.com:dude/project.git git checkout -b gtracy-master

问题 I'm trying to manage a pull request on a repo that I don't own but have admin rights on. When I attempt to pull in changes from another fork, it fails with an error that is less than clear. Here is my workflow... Fork main repo Make changes in that fork Commit to that fork 3.5 (goto step 2) Submit a pull request to the main repo As an administrator of the main repo, I'm attempting to merge those changes as follows... git clone git@github.com:dude/project.git git checkout -b gtracy-master

问题 Every time I merge a branch back into my master branch, I can no longer push to origin. I get the message fatal: master cannot be resolved to branch I made a simple test change: Created a new branch git branch TestBranch Made a change to TestBranch and commited Checked out back to master git checkout Master Merged TestBranch git merge TestBranch The merge seems to have gone fine, but now when I use Git status the Master branch does not tell me that it is ahead of the origin. And when I try to

问题 I'm looking for a way to see, though egit, to the whole history of my current git repo. From what it looks like, egit's "Show in History" will only show commits up to the current commit. With this I mean that if I do commit1 and commit2 and then decide to do checkout of the first, running "Show in History" of the project will not show up commit2. Is there any way that allows me to see the whole history of the repo? I guess that'll be somehting on the lines of the git log master console

问题 I'm looking for a way to see, though egit, to the whole history of my current git repo. From what it looks like, egit's "Show in History" will only show commits up to the current commit. With this I mean that if I do commit1 and commit2 and then decide to do checkout of the first, running "Show in History" of the project will not show up commit2. Is there any way that allows me to see the whole history of the repo? I guess that'll be somehting on the lines of the git log master console

问题 I need an application to be able to fetch from a git repository but not push to it, so, that's the read-only part. That could easily be done with git daemon. On top of that, I need access to said repository to be password-protected, including for reading it. So before any fetching can happen, the application will need to authenticate. Is it doable? with git daemon? something else? http + auth maybe? 回答1: HTTP authentication will not protect the pack being transmitted over the wire, so if you

问题 how does version control usually work? does it save diff files as a trail with hashes to validate the trail? 回答1: Different VCS use different approaches. CVS, for example, will create a file on the server for each file which you commit. This is essentially a file in RCS format; CVS is only a wrapper around RCS which runs the RCS commands over many files in a directory subtree (RCS can only work on single files). The RCS file contains a list of changes (version number, checkin message and how

问题 With the new Asp.net Core MVC projects such as: There are a lot of unfamiliar folders there, like bower_components , wwwroot , Dependencies , etc.. What should be stored in source control? 回答1: Anything that is a project setting, or that you directly change you should store. Anything that is directly downloaded (references, bower/node) or is directly based on those (lib folder getting copied by gulp) should be ignored. So, in your case, ignore bower, node, and project\wwwroot\lib. You want

问题 I'm new to version control, so I apologize if there is a well-known solution to this. For this problem in particular, I'm using git, but I'm curious about how to deal with this for all version control systems. I'm developing a web application on a development server. I have defined the absolute path name to the web application (not the document root) in two places. On the production server, this path is different. I'm confused about how to deal with this. I could either: Reconfigure the

问题 Sometimes I work on system without X Window installed, and can't use Git GUI. What are existing console alternatives to the git add -p ? I like almost everything that it does (more than Git GUI actually), but I hate that it does not let me view the whole picture and choose the order that I want to review the chunks. That's the only actual advantage of Git GUI over git add -p to me, but it is rather crucial one. I tried tig , but I do not like the user experience that it offers. Any