The source project of this merge request has been removed.
please add my new app Vibora-Feed to f-droid
Philipp Krönke (owner of the vibora.de website) knows, tested and accepted the app :-D
Looks good. Squash commits and force-push to update this MR.
Hi Boris. Sorry, I need some guidance. I am confused about git. I search again for hours (!!) to find the right 2 or 3 git commands. My last merge I did a squash, but it was only localy. to permit problems it would be great, to get these git/command line "hacks" from you. Is this right: "Squash commits" means, that I have to inserts the "xx Commits behind" into my local repository and "join" them to my "please add my new app Vibora-Feed to f-droid" commit (08978411)?
After many testing/merging/rebase experiments I did this:
rm fdroiddata git clone email@example.com:deadlockz/fdroiddata.git cd fdroiddata
I add a upstream in my .git/config:
[core] repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true [remote "origin"] url = firstname.lastname@example.org:deadlockz/fdroiddata.git fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"] remote = origin merge = refs/heads/master [remote "upstream"] url = email@example.com:fdroid/fdroiddata.git fetch = +refs/heads/*:refs/remotes/upstream/*
I hope, this is a good basic to make helping easy. It would be very, very nice from you to send me the nessesary command line input. "Squash commits and force-push to update this MR" sounds easy, but it isn't :-(
Seeing how you say "My last merge I did a squash, but it was only localy." it sounds like you simply forgot to force-push. I'm still going to give full instructions just for clarity's sake. Make sure you're on the master branch of your own repository, as this merge request is about merging your master branch into fdroiddata's master branch (see
Request to merge deadlockz:master into masteron the top of this page).
This article explains squashing. Because you have 8 commits, you should use
git rebase -i HEAD~8instead of
git rebase -i HEAD~3. And change the word "pick" to "squash" for each entry except the top one.
Now, you can simply force-push to that branch (
git push --forcewhen on it) and the merge request will be updated automatically.
@TheLastProject thanks for your guid. It was a little bit stange: I got more than 8 lines by
git rebase -i HEAD~8and a have to skip 3 times:
Could not apply ee6a143b849d35c6d63cfe25c3ddc7c93ad1cf40... Revert "add TextThing" Could not apply 64060181ea5bd70a1b6cb685563d4c2b3fe97e04... add TextThing again Could not apply 1edd4b6c26f172902f7866c9e8ead12095aac755... Removing "this android app is for android" clouse. ....
But now, there is a merge conflict on a complete different place. Clicking on "use theirs" gives me a "Something went wrong on our end." message.
"My goose is cooked."
Status changed to closedToggle commit list