Feature for disabling inherited dependencies

[hannes-harnisch]

See end of discussion in #1774.

[hannes-harnisch]

Any reason the checks are stalled?

[KyrietS]

Any reason the checks are stalled?

Your changes are in conflict with our master branch. Please rebase your branch on top of master 🙂

[hannes-harnisch]

Any reason the checks are stalled?

Your changes are in conflict with our master branch. Please rebase your branch on top of master 🙂

Any idea how I can do that quickly without polluting the commits here again? Because that was the reason the original PR was merged and then undone.

[nickclark2016]

Could you rebase the the branch?

[hannes-harnisch]

Could you rebase the the branch?

I can't. I have to merge master via a PR on my own fork first. I don't think I have another choice, GitHub doesn't seem to leave me one.

[samsinsane]

@hannes-harnisch Add a remote for this repo to your checkout and then rebase to this repos master. I tested this with your branch, but because you're trying to submit a commit that's already in master, it's a bit more complicated.

This will add a remote called premake and fetch the branches:

git remote add premake git@github.com:premake/premake-core.git
git fetch premake

This will start an interactive rebase from your master (where all of your changes originate) onto the current master of Premake:

git rebase -i --onto premake/master origin/master

This will then bring up a prompt, press i to begin insert characters, move to the second line using the down arrow, press f and then delete pick using the del key. Then move down to the third line and press f and delete pick again. Then press the escape key, and type :wq which will save and quit the prompt.

Your branch will now have the commit message Implementing "inheretdependencies" and contain all of your changes. Once this is done, you'll then need to git push --force-with-lease to push the updated branch. If you don't include --force-with-lease or --force, it will fail as the branch is different.

Normally, you would just git rebase premake/master but because your commits are already in master, it just moves your branch tag to master without any of the changes.

[hannes-harnisch]

@samsinsane Thank you so much for taking the time to write out the detailed explanation, it worked. I've done a few rebases before but those were very simple situations and I'm far from a Git expert.