I have a file in my Pycharm which I have changed so the commits are shown. As soon as I run the following command thorough the CLI and try to change the active branch (via CLI or Pycharm GUI):

i’ve been working on a small coding project with a few friends. In this project, they downloaded an open source online game (Space station 13, if you’re curious) and uploaded their modifications to github as a new Repo. This works fine, but when working with original code, I cannot see history from the original game we downstreamed from, just showing as “Initial commit” since it was a source code uploaded opposed to properly downstreaming their repo. I am wondering, would it be possible to set the original repo as an upstream now, or would it be pretty much impossible at this point? (there’s like 5 years of commits and I joined the group relatively recently.)

I am trying to follow along Michael Hartl’s Rails tutorial but I’ve run across an error.

On GitHub, let’s say I committed 12 times (following the “commit often” practice) and now the PR is ready, and I finally got it all reviewed and approved, and clicked on “Squash and Merge” on GitHub.

I’ve been working on a project and I recently made some pull requests for some updates I did in 5 new branches I created. The owner of the repo decided to release a new version of the website without merging my code first, so the pull requests no longer exists on the repo. He wants me to pull the new version to my local machine and make the pull requests on this new version.

I use git describe as a means to obtain a sensible version number for software I build & install from a non-release checkout of a git repository.

During the project, we encountered an issue with updates being delivered as an archive while work on the project is ongoing simultaneously. We are planning to improve the update process using patches, but there are concerns about potential conflicts between the changes in the project and the updates from the archive.

I forked someone’s repository on GitHub and would like to update my version with commits and updates made in the original repository. These were made after I forked my copy.

I forked someone’s repository on GitHub and would like to update my version with commits and updates made in the original repository. These were made after I forked my copy.

Closed 13 hours ago.