![]() I want to understand and implement the best way to develop on 2 different branches whilst keeping them both up to date with upstream. I'm using git on MSYS2 bash but would certainly consider a GUI if that's easier/better for my needs.Īny advice would certainly be appreciated. ![]() ![]() I’ve tried to Google but that just made me more confused lol Then someone else said do not use rebase on a shared repo without really explaining why. Someone then said ‘git fetch’ is now not the preferred method and to use ‘rebase’ instead. More than 100 million people use GitHub to discover, fork, and contribute to over 330 million projects. Actually, you can git pull :me/foobar, which removes the caveat. However, if it is shared with other people, you may have to pull from your fork, in which case a separate remote is the only solution. I went on IRC and in their defence I don’t think I explained it too well, but someone said I need to add an ‘upstream remote’ pointing to the original GitHub project that I forked from and then ‘git fetch’ from this. This is perfect if you are the only one making changes to your fork. Upstream is updated very frequently, usually a few times a day. Ideally I want both ‘develop’ and ‘mine’ to stay up to date with upstream commits whilst being separate on my own repo. I’m not really sure how to keep everything up to date in regards to upstream changes. I’ve forked the GitHub project and cloned it to my PC and then created branches from master called mine, which will be used for me and only me, and develop which I intend to submit the Pull Requests from. This is the only bit I’m fairly sure I’ve done right. Obviously I do not want to these changes to appear in any PR’s. For example, I’ve changed my MakeFile to use –march=native ( for that placebo effect ) ) and other things that may help a Windows only use case etc. Platforms: Mac, Windows Price: 49.99 (Free evaluation) License. I’ve cloned a fairly large GitHub project that I intend to do Pull Requests to but I also I want a copy just for me as I intend to make specific improvements for my Windows install whereas the actual github project is platform agnostic. Platforms: Mac, Windows Price: Free License: MIT. I’m a GitNoob (tm) and I’ve managed to confuse myself and already had 2 different answers and I’m now I’m not sure what to do.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |