cups

cups copied to clipboard

Weird, the code seems to be in place: https://github.com/OpenPrinting/cups/pull/852/commits/1f71a7a34973e2bcafbba70bf93e87d150398cf8

Dec 30 '23 19:12 OlesyaGerasimenko

Hi @OlesyaGerasimenko ,

I'm not a Git expert, but I can tell you what works for me when I want to create a pull request:

• clone the upstream (OpenPrinting CUPS) repo on Github,
• in terminal, clone personal OpenPrinting CUPS clone to local machine with f.e. git clone [email protected]:zdohnal/cups.git
• add OpenPrinting CUPS as another remote with git remote add upstream https://github.com/OpenPrinting/cups

This gives me basic setup - I can push into my repo by default and I can always fetch upstream changes from OpenPrinting by git pull --rebase upstream master and push them to my clone by git push.

Then I create a separate branch by git checkout -b <branch-name> and push my changes into it - pushing the changes into master may work for one time contribution (if I delete the Github repo once it is merged) if I am lucky - otherwise it can get difficult if there are conflicts and the git history becomes less readable (at least in my case - I always want my local master to be 1-to-1 with upstream master branch, since it shows me what is in upstream more clearly). Once I have committed all changes, I push a new branch by git push --set-upstream origin <branch-name>.

And if there are new changes in upstream master, I have to propagate them into my branch:

• first I take changes from upstream repo - git pull --rebase upstream master && git push when I am in local master branch of my clone,
• switch to my branch by git checkout <branch>,
• rebase the branch according master branch by git rebase -i master,
• solve any possible conflicts - in case my changes should rewrite upstream changes, remove blocks from upstream (any conflicting line blocks are marked by >>>> and <<<< - those have to be solved) and vice versa. If upstream changes are not related to my changes, I have to adjust the code to contain both (this is what happened to you - upstream changes are not related to your changes, so you had to keep them, but they were removed instead, which is an issue),
• once rebase finishes (there are clear instructions on command line how to proceed during rebase) push the changes with git push --force.

If I check your git history, I see you have tried to merge master branch of OpenPrinting CUPS, but it does not look like recent HEAD of master branch.

If I were you, I would take my changes and delete my cloned github repo, since it would be easiest for me, but in case you would like to keep your repo:

• you can cherry pick your changes by git format-patch -1 <commit ID>,
• do hard reset to the commit before you made changes by git reset --hard origin <commit ID before you started to make changes> && git push --force,
• check if you have the remote set by git remote -v - if not, add it via git remote add command above,
• update your repo by git pull --rebase upstream master && git push,
• apply your changes and fix any possible conflicts (beware of removing any changes which come from upstream :)),
• Github should now see your changes.

Jan 02 '24 12:01 zdohnal

Closing this for now, please open a fresh PR once you have resolved the issues.

Apr 06 '24 13:04 michaelrsweet

@michaelrsweet, #895 and #894 are updated versions of this translation.

Apr 06 '24 14:04 ValdikSS