2022-08-16

Question So I first forked a repo and then made a commit to that forked repo. I then opened a pull request. The pull request listed all the changes I wanted. After reviewing my pull request, there were a number of changes that the repo owner wanted me to make before he accepted it. I have made those changes in my fork, now how do I update the pull request with those changes (or is this not how I should handle it)?…

#git

2022-08-16

Question git push --tags is a separate operation to git push since pushing tags should be a conscious choice to avoid accidentally pushing the wrong one. That's fine. But how do I push them both simultaneously / atomically? (git push && git push --tags is not perfectly atomic.) Answer Update August 2020 As mentioned originally in this answer by SoBeRich, and in my own answer, as of git 2.4.x git push --atomic origin <branch name> <tag> (Note: this actually work with HTTPS only with Git 2.…

#git

2022-08-15

Question When I tried to run git push origin master --force I just got Counting objects: 2649, done. Delta compression uses up to 2 threads. Compressing objects: 100% (1280/1280), done. error: RPC failed; result=22, HTTP code = 413 | 116 KiB/s fatal: The remote end hung up unexpectedly Writing objects: 100% (2504/2504), 449.61 MiB | 4.19 MiB/s, done. Total 2504 (delta 1309), reused 2242 (delta 1216) fatal: The remote end hung up unexpectedly Everything up-to-date Is it something to do with not being secure?…

#git

2022-08-15

Question If one would checkout a branch: git checkout 760ac7e from e.g. b9ac70b, how can one go back to the last known head b9ac70b without knowing its SHA1? Answer If you remember which branch was checked out before (e.g. master) you could simply git checkout master to get out of detached HEAD state. Generally speaking: git checkout <branchname> will get you out of that. If you don't remember the last branch name, try…

#git

2022-08-15

Question Is there a Git command to revert all uncommitted changes in a working tree and index and to also remove newly created files and folders? Answer You can run these two commands: # Revert changes to modified files. git reset --hard Remove all untracked files and directories. ‘-f’ is force, ‘-d’ is remove directories. git clean -fd

#git

2022-08-14

Question I'm new at the branching complexities of Git. I always work on a single branch and commit changes and then periodically push to my remote origin. Somewhere recently, I did a reset of some files to get them out of commit staging, and later did a rebase -i to get rid of a couple recent local commits. Now I'm in a state I don't quite understand. In my working area, git log shows exactly what I'd expect-- I'm on the right train with the commits I didn't want gone, and new ones there, etc.…

#git

2022-08-14

Question Possible Duplicate: Intellij Idea 9/10, what folders to check into (or not check into) source control? I started using WebStorm for web development and am not sure what to add and what to exclude from our Git repository. Clearly some files inside the .idea folder are meant to be version controlled like the external library settings (jsLibraryMappings.xml) but others will probably change very often and are developer-specific (e.g., workspace.xml).…

#git