Closed 22 mins ago.

I have 2 branches. Let’s call them main and better. I want better branch to stay up-to-date with main, and have it’s own commits. I merged new commits from main into better, and there was merge conflict. After resolving it I saw that better is still some commits behind main. Turns out when I resolve merge conflict it edits original commit, instead of creating new one. So git “thinks” that better doesn’t have that commit, because now it has edited commit instead.

I have 2 branches. Let’s call them main and better. I want better branch to stay up-to-date with main, and have it’s own commits. I merged new commits from main into better, and there was merge conflict. After resolving it I saw that better is still some commits behind main. Turns out when I resolve merge conflict it edits original commit, instead of creating new one. So git “thinks” that better doesn’t have that commit, because now it has edited commit instead.

I have 2 branches. Let’s call them main and better. I want better branch to stay up-to-date with main, and have it’s own commits. I merged new commits from main into better, and there was merge conflict. After resolving it I saw that better is still some commits behind main. Turns out when I resolve merge conflict it edits original commit, instead of creating new one. So git “thinks” that better doesn’t have that commit, because now it has edited commit instead.

I find a line Footer is saved at the end of the file, with fixed length in fileA, and I want to know at which commit this line is added. Then a use

I find a line Footer is saved at the end of the file, with fixed length in fileA, and I want to know at which commit this line is added. Then a use

I find a line Footer is saved at the end of the file, with fixed length in fileA, and I want to know at which commit this line is added. Then a use

The documentation of git-commit-tree states the following:

I need to create a repository for a large game on Unity, the size of which is not limited to 1 GB. It is desirable that such a repository be free (at least at the initial stage of development). I heard that GitHub can be used for such purposes, splitting a large project into parts that will be stored in several repositories. I created the main repository with the code and a repository with images to store the project images. The code is committed normally. But when I want to commit the images to the image repository, GitBash gives me a message that the histories of the local repository (with the project) and the remote repository (with images) do not match. And therefore it is impossible to push a commit. What should I do, how to make commits to the image repository and track image changes in the main project relative to the repository with images?

I need to create a repository for a large game on Unity, the size of which is not limited to 1 GB. It is desirable that such a repository be free (at least at the initial stage of development). I heard that GitHub can be used for such purposes, splitting a large project into parts that will be stored in several repositories. I created the main repository with the code and a repository with images to store the project images. The code is committed normally. But when I want to commit the images to the image repository, GitBash gives me a message that the histories of the local repository (with the project) and the remote repository (with images) do not match. And therefore it is impossible to push a commit. What should I do, how to make commits to the image repository and track image changes in the main project relative to the repository with images?