Tag: github

Git/source tree move specific commits at branch B to branch A

I have an accident when develop. I have two commits which need at branch A but I pushed to branch B. So now, I want to move those commit to branch A and then remove them from branch B. Please view image for detail:

(Git Merging) When to use 'ours' strategy, 'ours' option and 'theirs' option?

Definition of recursive merge strategy pulled from the git merge documentation. This can only resolve two heads using a 3-way merge algorithm. When there is more than one common ancestor that can be used for 3-way merge, it creates a merged tree of the common ancestors and uses that as the reference tree for the […]

Delete all git branches but X and Y

I’ve inherited a project that has over 800 branches, each having hundreds of commits and thousands of changes. The branches were created to isolate and fix small issues in the project, but weren’t deleted afterwards. Now trying to compare branches in GitHub takes forever, and deleting branches one by one is mind-numbing. Can I tell […]

Python Git Bash CMD Script

The code is pretty straightforward, it just opens windows command prompt and executes the calling() function. It has basic git commands which help me push to a git repo. I have configured ssh and remote repo. Link:https://github.com/vivekpatani/git-script-gitter I can change the date, but when I push it to git, it displays the current date on […]

When exceeding the data quota, what is the best way to “split up” this github repo?

I added several ~1M files to (an already large) repo. Upon the next add/commit/push, I received this error: Git LFS: (0 of 1 files) 0 B / 28.35 KB batch response: http: This repository is over its data quota. Purchase more data packs to restore access. Docs: https://help.github.com/articles/purchasing-additional-storage-and-bandwidth-for-a-personal-account/ error: failed to push some refs to […]

Files containing vendor as a string not displayed on Github Pages

I recently released my application to Github Pages, but i started getting 404 responses for files containing the string vendor. Is there a reserved filenames list? I have vendor.bundle.js in my gh-pages branch here https://github.com/emartech/angular2-phonecat/tree/gh-pages . But the response is 404 https://emartech.github.io/angular2-phonecat/vendor.bundle.js . It seems consistent between different repositories.

GitHub Flow and Releases

We are relatively new to git in general. We’ve been using it for about 6 months and have used GitHub and BitBucket. We’ve tried to learn as much as is possible by using GitBash so we can get under the core of git. We’re at the stage where we really want to consider our branching […]

How do I copy a remote branch on GitHub into a new remote branch?

Specifically, I never want the new branch to exist on my hard drive. I just want my existing branch develop copied into a new branch on GitHub called meow

autodoc directive works locally but not on readthedocs

My repo is located on github here: https://github.com/AshleySetter/optoanalysis And the docs are in https://github.com/AshleySetter/optoanalysis/tree/master/optoanalysis/docs ReadTheDocs doesn’t fail but the produced documentation (hosted here: https://optoanalysis.readthedocs.io/en/latest/) doesn’t display the doc strings that should be produced by the ..autodoc:: command. However it runs fine locally and displays the documentation when I open the build/html/index.html file. On ReadTheDocs it […]

Push to GitHub fails when using git protocol

I am trying to push to Github but I am getting the following error fatal: remote error You can’t push to git://github.com/username/repo.git Use https://github.com/username/repo.git I looked on internet and saw that I have to replace git:// with http:// but I already have it set to the correct address. This is my config: [remote “origin”] url […]

Git Baby is a git and github fan, let's start git clone.