A Git repository is a tree structure, where the nodes of the tree are commits. To understand this, we need to understand a bit about how Git works. Regardless of the reason, if your pull request has gone stale, you will need to rebase your branch onto the latest version of the master branch before it can be merged. Sometimes, a pull request can go stale without conflicts: perhaps changes in a different file in the codebase require corresponding changes in your pull request to conform to the new architecture, or perhaps the branch was created when someone had accidentally merged failing unit tests to the master branch. The most common reason why pull requests go stale is due to conflicts: if two pull requests both modify similar lines in the same file, and one pull request gets merged, the unmerged pull request will now have a conflict. A "stale" pull request is one that is no longer up to date with the main line of development, and it needs to be updated before it can be merged into the project.
#Github desktop rebase current branch update#
I'd like to be able to update my branch with the new master branch code that gets submitted to interkarma/daggerfall-unity without creating unwanted commits in my branch.When many different people are working on a project simultaneously, pull requests can go stale quickly. I was seeing that happen when I tried to remove commits for my SoundMusic branch (#690) earlier. For example, if a line was added in a commit that I didn't make, and I chose to drop that commit, the commit appears as one that will remove that line from the upstream master code when I try to submit a PR. the commits become ones that undo the original commits. If I try to rebase with the interactive option, I can pick which commits I want to keep (ones that I made), but If I choose to drop or squash the other commits, and submit a PR. When I try to publish my branch, it will have all records of commits in the PR that I submit to Interkarma. I've found in the past that using git merge upstream/master does update the branch with commits to the upstream master, but it adds all commits (even ones other people made) to my branch. but I know that commits that were made to the master branch won't be made to the 'croucher' branch without the right git command. I've been working on a branch that I created from Interkarma's master branch a while ago called "croucher".
#Github desktop rebase current branch how to#
Now I just need to figure out how to get my code from your camera recoil branch. I'd like to just simply synchronize my fork with yours, and get rid of any commits that github thinks I wish to be ahead of yours.ĮDIT: I deleted my headswayer branch and used this web page. now I am 8 commits ahead of your master, And want to revert the master on my fork to your fork. I think I accidentally pulled code from your "Camera-Recoil" branch into my master branch fork of DFU, (thinking it was my branch) but it actually was an older version of the code i submitted to you before. I think I made a mistake, I think I accidentally pushed my fork's master branch to yours. It also helps to make a branch on your end for changes so you can keep them separate from the master code. If I have any feedback or need changes made before merging, I will add that to the comments on the PR.Īnd yep you've got it right - develop on your fork and send your changes to me via PR. I can see the PR there and will process this as soon as I have time.
0 kommentar(er)
