-
Notifications
You must be signed in to change notification settings - Fork 18
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Enhancement] reset package to upstream state #10
Comments
That sounds kind of awkward if you ask me. ... What kind trouble are we talking about here? If there are AUR commits which are not locally present and local commits which are not remotely present, |
example : Does git checkout HEAD remove the incorrect commit(s) ? |
If the conflicting commit is the most recent one, you could use You can also use |
What if I accidentally rebased local commits after pushing to AUR? How do I get back to a workable situation where my local work is on top of what the AUR already knows about? I.e. rebase anything I have that touches that subtree onto the remote commits. |
You could use the reflog to find the last good commit. In general, rebase is a powerful tool which you should treat with care; standard advice for git is to not force push public history, subtrees just make that cause conflicts visible to the repository owner instead of only to downstream people who have cloned it. If you really just want to delete it from git, then re-add the package from scratch, it's probably as simple as 'git rm -r pkg/; git commit; aurpublish -p pkg'. But I haven't experimented. |
Sometimes adding changes goes wrong and people have trouble reverting to a known good state.
A simple way to solve this with a single git repo is to remove the local git repo and re-clone the upstream repo .
having a command to do this in the aurpublish combined repo would be a good thing.
possible invocation
aurpublish -reset PACKAGE
The text was updated successfully, but these errors were encountered: