version-control

问题 So I'm using GIT, trying to push code to my remote server. on a shared unix hosting, and I'm not allowed to have my own environment variables (blocked for SSH accounts) and no sudo access. managed to install git successfully in my /home/ trying to push code to the server returns : bash: git-upload-pack: command not found $PATH variable is set - because git is installed in my /home/ to get things working, I had to use to following clone command : git clone -u /home/bin/git-upload-pack user

问题 I'd like to know how you handle a situation like this in Git: create branch task001 from master master: modify foo.c and rename it to bar.c task001: modify foo.c and rename it to moo.c merge task001 to master What Git tells me is: CONFLICT (rename/rename): Rename "foo.c"->"bar.c" in branch "HEAD" rename "foo.c"->"moo.c" in "task001" Automatic merge failed; fix conflicts and then commit the result. How should I solve it? I mean, I still want to merge the two files once the name conflict is

问题 I have a big project(let's say A repo ), and it there one child folder which is come from B repo . I would meet warning like below when I commit from A repo warning: adding embedded git repository: extractor/annotator-server hint: You've added another git repository inside your current repository. hint: Clones of the outer repository will not contain the contents of hint: the embedded repository and will not know how to obtain it. hint: If you meant to add a submodule, use: hint: hint: git

问题 Yesterday I cherry-picked two commits into my main branch, one of them caused merge conflicts and I resolved them, committed and pushed them to origin. Today I am attempting to pull from the server when I get the following error: $ git pull fatal: You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists). Please, commit your changes before you can merge. $ Git status reads: $ git status # On branch main # Your branch is behind 'origin/main' by 2 commits, and can be fast-forwarded. # $

问题 The common mistake I make in git is not check on which branch I am commit changes to a wrong branch (on branch B, thinking I'm on A, commiting a change for feature A) How do I get back, and commit the edits to the proper branch? 回答1: rebase --onto can help here, especially if you have a range of commits to move back. Do not forget a git stash to save any current uncommitted changes which are relevant to " wrongBranch " (the one where commits were appropriately applied), in order to pop them

问题 I've just inherited a project which was maintained using Git. At one point, the code was deployed onto 3 separate systems and each system maintained their own decentralised Git respository. Each of the 3 systems extended the original base system in 3 different directions. None of the 3 systems have been synchronised against each other. Some changes are on master branch, others are on new branches. How can I bring the 3 different sources together so that I can: find a common base to work with;

问题 I need to associate a clean unversioned code to an existing git remote repository. I explain better my situation. My project is moved from svn to git. I have a svn local working copy with old code (nothing new to commit) that has to be syncronized with the new git repository. I could clone the repo but I should restore many ignored configuration files by hand and I would avoid it. So I removed all .svn directories and I would track my code with the git remote repository. Is there a way to do

问题 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 . I am looking for a version control system which I can use for the Code of VBA possibly in a form of add-in but similar to SVN or Git or even a commercial software. I know there is a discussion here and there however, they are older than 6 years and that is not exactly what I want to have. And I know one can use

问题 I'm in the middle of a rebase of my master to a stage branch git checkout stage git rebase master At some time I deleted two files then modified the two files according to GIT. warning: too many files, skipping inexact rename detection CONFLICT (delete/modify): test-recommendation-result.php deleted in HEAD and modified in [Bug] Fix test recommender. Version [Bug] Fix test recommender of test-recommendation-result.php left in tree. CONFLICT (delete/modify): test-recommendation.php deleted in

问题 I'm in the middle of a rebase of my master to a stage branch git checkout stage git rebase master At some time I deleted two files then modified the two files according to GIT. warning: too many files, skipping inexact rename detection CONFLICT (delete/modify): test-recommendation-result.php deleted in HEAD and modified in [Bug] Fix test recommender. Version [Bug] Fix test recommender of test-recommendation-result.php left in tree. CONFLICT (delete/modify): test-recommendation.php deleted in