|
I made a fork of a Github project, made a pull request, which was accepted. All good.
Later the original project made some new changes...
Now I can't figure out how to incorporate changes from the original project to my forked version! :/
Any clues?
[Solved] Using TortoiseGit UI I "rebased" my master branch to their master branch.
modified 23-May-16 5:49am.
|
|
|
|
|
This isn't really the right forum for this - "This forum is for discussing and recommending Free tools for software development".
Having said that, I'm not sure which forum it does belong in.
"These people looked deep within my soul and assigned me a number based on the order in which I joined."
- Homer
|
|
|
|
|
yeah, me neither....
but.. but.. GitHub IS a free too! 
|
|
|
|
|
|
Thanks Alize.
As the title implied.. this problem has been solved, using rebase, just like in the solution your submitted! 
|
|
|
|
|
Bareos is a 100% open source fork of the backup project from bacula.org. The fork is in development since late 2010, it has a lot of new features.
For all your backup needs.
What do you get when you cross a joke with a rhetorical question?
The metaphorical solid rear-end expulsions have impacted the metaphorical motorized bladed rotating air movement mechanism.
Do questions with multiple question marks annoy you???
|
|
|
|
|
|
AOMEI Partition Assistant: powerful and easy tool to maintain hard drive and partition[^] - it's free, and includes an option to "Migrate OS to SSD".
I tried it today. OK, I backed up another full disk image last night first, but...
It worked. Very easy to use, quick - less than half an hour - and all I had to do was manually enter BIOS and tell it which disk to boot from because I don't use UEFI but Legacy Bios (my motherboard doesn't have a UEFI option). If you use UEFI you shouldn't even need to do that!
I was expecting it to be a whole lot harder - I'll leave the "Old" hdd boot partition there for a month or so in case of problems, but the migration was a lot simpler than I thought it would be.
So simple in fact that I wasn't sure if it had worked at all - until I opened VS in seconds instead of minutes! 
Bad command or file name. Bad, bad command! Sit! Stay! Staaaay...
|
|
|
|
|
I tried it and it was all right. Works well and speeds everything up.
|
|
|
|
|
Yes, it speeds up my 9 year dual core laptop. Now after ssd update it is still usable to browse internet, or ms office work.
|
|
|
|
|
Does it possible to move the whole Windows OS from HDD to SSD or an old SSD to a new one without hurting the OS? Such as broken, error (BSOD), or can't work properly.
|
|
|
|
|
Did for me!
I did a image backup before I started just in case, but it did all the work - the only thing I had to do afterwards was check the BIOS to make sure the PC would boot from the right device. If you use UEFI instead of BIOS booting (i.e. GPT instead of legacy) then I believe it gets that right as well.
I'm still running on the SSD it created 4 months later without any problems from OS or apps.
Then a month after I swapped, I used it again to "recycle" the old OS partition and extend my data partition to fill the HDD.
Bad command or file name. Bad, bad command! Sit! Stay! Staaaay...
|
|
|
|
|
I will do the same like you. I just afraid it won't work because drivers or something else.
|
|
|
|
|
|
Have you tried any premium recovery software yet? In the past, I have delete some important files but UndeletePlus helped me to restore it.
|
|
|
|
|
Tired of accidentally hitting Caps Lock or Insert while you're typing?
I wrote this NumCapsInsScroll app[^] to give you both visual and audible notifications when you hit one of those keys.
Download Here
[^]
Please provide feedback. Source code available upon request.
If it's not broken, fix it until it is
|
|
|
|
|
Thanks. Why not post it as a CP article? 
/ravi
|
|
|
|
|
That's pretty slick. 2 thoughts come to mind:
- Make each button optional...that is, I might not care about displaying the state of Scroll or Ins
- Wondering if it would look better as a set of icons in the system tray (next to the clock) instead of a floating window...that might go against Microsoft's long-standing position on "abusing" the system tray, but nobody's going to break down your front door and bring you in for questioning if you do. Besides, it could also be a user option (one or the other...or both, really).
|
|
|
|
|
Thanks for the feedback.
1) I like the idea of independently tracking each button. Easy option to add in.
2) The Toolbar doesn't have to be displayed. The second option on the Options dialog is "Show the toolbar", which when unchecked, hides the toolbar.
I got this idea from a similar app I saw that had an icon with 3 vertical bars that turned green when their specific button was pressed. I could do the same I guess.
As far as using the System Tray - Screw MS  ...
If it's not broken, fix it until it is
|
|
|
|
|
Kevin Marois wrote: The Toolbar doesn't have to be displayed
Of course...but then, there's little point in leaving the app running if it's not going to show anything, right? My main point is that I'm not a fan of floating windows, especially if they're intended to show information you only want to quickly glance at.
But hey, these were merely ideas I was throwing at you.
|
|
|
|
|
dandy72 wrote: but then, there's little point in leaving the app running if it's not going to show anything, right?
Wrong. The app is monitoring the state of the keys. When you press one it plays a Click sound. The toolbar isn't really necessary. Closing the toolbar doesn't kill the app.
If it's not broken, fix it until it is
|
|
|
|
|
Ah, ok. That'll teach me to provide feedback for an app without even...downloading it. 
|
|
|
|
|
No worries
If it's not broken, fix it until it is
|
|
|
|
|
|
What?
If it's not broken, fix it until it is
|
|
|
|
General 
News 
Suggestion 
Question 
Bug 
Answer 
Joke 
Praise 
Rant 
Admin 
Submit an article or tip
