Skip to content
This repository has been archived by the owner on Oct 9, 2018. It is now read-only.

Context menu update #1020

Closed
wants to merge 18 commits into from

Conversation

listedegarde
Copy link
Contributor

This is a very minor update in the instructions for inserting the context menu, as requested in #996.
Hopefully I'm making the pull request the right way around. I have the blackberry repo on the left, and my repo on the right, but I always get confused with way around it's supposed to be.

@listedegarde
Copy link
Contributor Author

Sorry - that all looks rather massive, but I was just trying to get rid of the temporary file my file editor created before it got merged in.

@tneil
Copy link
Collaborator

tneil commented May 28, 2014

ok... which commit in the pull request is the one with your intended changes? Then we'll take it from there :)

@listedegarde
Copy link
Contributor Author

OK. Looks like I still don't have this down. Thank you so much for your patience. Even the last commit that I did before your comment was missing my updates. Anyway, I finally got it right in the 1c17a3d, I think. At least, the "Files Changed" button at the top shows what I want, and my "context-menu-update" branch on GitHub looks correct.

I don't know what I was doing wrong, but Git kept telling me that I had to pull before I could push which, I believe, caused me to revert to the previous version locally (but from all the merging tracked on GitHub, I really don't know). What's more, I kept ending up with a temporary file that my editor created (and I didn't want to push to GitHub) and Nautilus wasn't updating to reflect the changes: I was unable to see the temporary file in Nautilus despite being able to do a "rm" of the final from the terminal.

So yeah, 18 merges to add one simple line - I'm feeling rather dumb.

Edit Oh, and do I have to do a commit --amend if I have already opened a pull request, or can I do a brand new commit? I believe that might have been part of my problem: I was trying to amend my commit.

@tneil
Copy link
Collaborator

tneil commented Jul 14, 2014

I'm just going to close this pull request so that I can delete the 10.3 branch that has now been merged down into master

@tneil tneil closed this Jul 14, 2014
@listedegarde listedegarde deleted the context-menu-update branch August 8, 2014 01:17
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants