version-control

问题 How do I get the name of the remote git branch from which the local git current commit was branched-off? I assume this is a 4 step process, and that the first three steps might be as follows: Step One: Get the name of the current branch in the local git repo: git rev-parse --abbrev-ref HEAD Step Two: Get the hash of the currently checked out commit from the local repo: git rev-parse HEAD # full hash Step Three: Get the name of the upstream tracking branch on the remote git repo: git rev-parse

问题 What are some examples of version control systems that work on files and on lines of files? In my understanding, a control system that works on file is able to automatically manage merges whenever there are no file conflicts: for example: A,B,C --> A',B',C | (branch) ___________ (merge) -> A',B',C' -------> A,B,C' In what cases a version control system that work on lines is able to manage merge by itself and in what other cases it asks the developer to solve them? 回答1: Your questions is too

问题 My requirement is simple. At the beginning of each file there should be a block comment like this: /* * This file was last modified by {username} at {date} and has revision number {revisionnumber} */ I want to populate the {username} , {date} and {revisionnumber} with the appropriate content from SVN . How can I achieve this with NetBeans and Subversion ? I have searched a lot but I can't find exactly what I need. 回答1: I looked at this question and got some useful information. It is not

问题 I just learned about source control and tried using it - so I activated for a project via VS2013 and it works locally, but then I tried to set up a repository at GitHub.com. I used the default settings, which means https type connection (there is only https or ssh), but when I copied the url of the repo to VS to publish to it, VS showed the following error: "An error occurred while sending the request". I looked it up and almost all guides refer to opening a repo with an https type connection

问题 Scenario: being on master branch git checkout target_branch git checkout new_branch git commit -m: "TARGET BRANCH TASK NUMBER,NEW BRANCH TASK NUMBER: Message" git push origin new_branch git checkout target_branch git push origin target_branch merge request (target - target_branch ) As I understand my new_branch isn't created from target_branch because firstly I made push from new_branch and only then I pushed target_branch (just forgot it). So help me please do properly the next: I'm going to

问题 I did a fresh git cvsimport into a new folder, after about 30 minutes it was finally done but it didn't seem to get any of the CVS folders. Since cvsexportcommit looks for the CVS folder in the directory, it fails. My cvsimport command was similar to below: git cvsimport -v -r cvs -d $CVSROOT <module> I then made changed in a work branch, checked out master, performed another cvsimport, merged the work branch onto master but then when running: git cvsexportcommit -w . -u -p -c ORIG_HEAD HEAD

问题 I'm planning to use GitLab to manage Git repositories (mainly Linux kernels from various hardware vendors). Currently, I'm using Gitolite to manage users on Git server and MediaWiki to have what a call a "branch table"; in other words, a table where the single users report: branch name (e.g. xboard-feat-i2c2) branch maintainer short branch description (e.g. "started from rev 2.0.0, feature branch to implement i2c2 driver on custom hostboard X") branch status (WIP, testing, ready to merge,

问题 Question: Is there a good free & open solution out there for revision control on an entire file system? This includes the question "would any of the typical revision control systems out there work for this (git, svn, bzr, etc.)?" Use case: We have filesystem images that represent installs that happen to some of our embedded systems where every last file installed can make a difference. They often require modification in the course of development, debugging, and maintenance. Those changes need

问题 I'd like to work on my own projects on different computers...on the road on a laptop, or at home on the desktop, or even at work. I'd like to keep the data relatively private, and I don't want to pay for private repositories on github. Ideally, I'd host a git or svn repository on my web host, or something like that. Can I do that? Or is there a web services-based version control system out there that accomplishes the same thing? 回答1: I use beanstalk for my development (svn). You could also

问题 Closed. This question is off-topic. It is not currently accepting answers. Want to improve this question? Update the question so it's on-topic for Stack Overflow. Closed 2 years ago . Some of our customers ask for end-user documentation in a format that’s suitable for printing. Currently, I use Microsoft Word 2002 to write the documents and a non-free PDF printer to generate a PDF file with searchable bookmarks. Then I store both files in the Subversion repositoryT. While it does the job, it