On Sat, 25 Apr 2020 at 04:21, Jon Elson <[email protected]> wrote:
> Can anyone suggest the steps to set up the source for master I think the fix should go in to 2.8, but the steps are the same. Get the basic tools: sudo apt-get install build-essential git git-gui Then try: git clone [email protected]:LinuxCNC/linuxcnc.git linuxcnc-dev That will work if your ssh keys are registered with LinuxCNC (and the keys on your current PC match) If that isn't the case it's not a big problem, you can instead use: git clone https://github.com/LinuxCNC/linuxcnc.git This way you will have to make changes in your own forked repository and submit them as pull-requests. That just means that someone with push access needs to approve your work, but it's all largely automated through the web site. In fact the devs with push-access themselves tend to work that way with anything that they want others to check over first. Then (for this): git checkout 2.8 You need to set up your name and email address in Git. Either git gui -> edit options or: git config --global user.name "Jon Elson" git config --global user.email [email protected] ... Do your stuff, test it etc. When happy with a change, make it in to a commit. Keep commits small, one issue per commit. I like to commit with the gui, you can see your changes and it highlights erroneous whitespace etc. git gui rescan stage changed Check through the files in the bottom left pane to see if there are any there you don't expect. Ditto on the top, see if any that should be there are not. Clicking the little file icon for each file will move it between panes. Clicking on the file name will show the changes in the main pane. red for deletion, green for addition. If there is something you see that you don't like, you can re-edit the file, save, click it back in to the top pane, then to the bottom frame again and check again. When happy: sign-off commit Personally I don't push from the GUI. I like to be really sure what I am pushing: git push --dry run Typical output is: remote: Resolving deltas: 100% (3/3), completed with 3 local objects. To github.com:LinuxCNC/linuxcnc.git 7f0135f4b..12d892e9d 2.8 -> 2.8 You can then copy and paste the commits into: git log 7f0135f4b..12d892e9d Which will show you a summary of what you are about to push. Or, to be really sure: git log -p 7f0135f4b..12d892e9d Which will show you changes line-by-line. Then, when sure: git push At this point it will either have gone straight to LinuxCNC or you need to make a pull request: Go to https://github.com/LinuxCNC/linuxcnc Click the "New Pull Request" button. (just above the file listing pane) Then click the blue "compare accross forks" link so that you can choose your version and the LinuxCNC version that you want to push to. -- atp "A motorcycle is a bicycle with a pandemonium attachment and is designed for the especial use of mechanical geniuses, daredevils and lunatics." — George Fitch, Atlanta Constitution Newspaper, 1912 _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
